From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Thu, 08 Jan 2009 09:49:16 GMT
Subject: Re: collapsing commits with rebase
Message-ID: <93c3eada0901080149m3c349e6bx33b58d653fd43b48@mail.gmail.com>
In-Reply-To: <200901072039.12631.bss@iguanasuicide.net>

On 1/8/09, Boyd Stephen Smith Jr. <bss@iguanasuicide.net> wrote:
> On Wednesday 2009 January 07 20:32:24 Miklos Vajna wrote:
>  >On Wed, Jan 07, 2009 at 08:11:32PM -0600, "Boyd Stephen Smith Jr."
>  <bss@iguanasuicide.net> wrote:
>  >> git merge -s sha(D)
>  >
>  >You probably mean --squash here, -s stands for --strategy - and I *hope*
>  >you don't have git-sha(D) in your PATH, as a custom merge strategy. ;-)
>

Many thanks, now I have plenty of ways to think about!

Cheers,
Geoff.