From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-31034-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 20085 invoked by alias); 7 Feb 2013 22:54:56 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 31034
Received: (qmail 20783 invoked from network); 7 Feb 2013 22:54:54 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED
	autolearn=ham version=3.3.2
Received-SPF: none (ns1.primenet.com.au: domain at macports.org does not designate permitted sender hosts)
X-AuditID: 12074412-b7f216d0000008e3-d7-51142f11d073
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\))
Subject: Re: [PATCH 3/3] zsh-development-guide: add a missing 'to'
From: =?iso-8859-1?Q?Lawrence_Vel=E1zquez?= <larryv@macports.org>
In-Reply-To: <CAHYJk3QDV5AW0gGGkArNf=wW1HjSvrnoWSA-eXCOx_oJLQKnmg@mail.gmail.com>
Date: Thu, 7 Feb 2013 17:47:40 -0500
Cc: Wieland Hoffmann <themineo@gmail.com>, zsh-workers@zsh.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <5FB5B5E9-F8EF-450E-802C-84CDCA6D81F0@macports.org>
References: <1360086270-13944-3-git-send-email-themineo@gmail.com> <CAHYJk3QDV5AW0gGGkArNf=wW1HjSvrnoWSA-eXCOx_oJLQKnmg@mail.gmail.com>
To: Mikael Magnusson <mikachu@gmail.com>
X-Mailer: Apple Mail (2.1499)
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGIsWRmVeSWpSXmKPExsUixO6iqCukLxJocH8eo8W5qd8ZLZZcS7E4
	2PyQyYHZY+esu+weqw5+YApgiuK2SUosKQvOTM/Tt0vgzpjw4hlrQTtTxYN3+5gbGC8ydjFy
	ckgImEhsXP2MFcIWk7hwbz1bFyMXh5DAZUaJ+9++MEM4p5gkjkzsYQepYhbQkrjx7yUTiM0r
	oCdxuHM7WLewgJPE4aWfwOJsAo4ST4/OZAGxOQUCJXac3QA0lYODRUBF4vEUb4gxdhJb2h4x
	QdjaEssWvmaGGGkv8WHfdXaIve2MEgt/rWcE6RUR0JBY/sYC4lBZiRVTe5kmMArMQnLRLCQX
	zUIydgEj8ypGucSc0lzd3MTMnOLUZN3i5MS8vNQiXTO93MwSvdSU0k2MkJAV2sG4/qTcIUYB
	DkYlHl6ds8KBQqyJZcWVuYcYJTmYlER5OZVEAoX4kvJTKjMSizPii0pzUosPMUpwMCuJ8Eao
	A+V4UxIrq1KL8mFS0hwsSuK8Pxer+wkJpCeWpGanphakFsFkZTg4lCR4hfSAGgWLUtNTK9Iy
	c0oQ0kwcnCCCC2QDD9CGD7ogG4oLEnOLM9Mhik4xKkqJ8/4FSQiAJDJK8+AGwJLLK0ZxoH+E
	eb+CVPEAExNc9yugwUxAg9dnCoMMLklESEk1MAb8Xf961YM53P1bI7Vi5q85+PVWjsJ+n+fe
	Bye8+drLZt1bKpx7in3DicteeseOfw1VELssZMng3PLz0PbS6RHzOHfrLOL7Ye2wxvtaPWfz
	s9aqdUc6j2uWrpy6xzTwTsFv1c/XVf4I9Z25IGLIc43l3aWpegJXhSIm3nd8dcjYa67VNc0b
	SvZKLMUZiYZazEXFiQDPZ2mICQMAAA==

On Feb 7, 2013, at 4:34 PM, Mikael Magnusson <mikachu@gmail.com> wrote:

> This isn't true afaik... Did whoever wrote it mean git merge --squash?

It's certainly true as written, but perhaps "git merge --squash" can be =
added as a third suggestion.

vq=