From: Miklos Vajna <vmiklos@frugalware.org>
Date: Thu, 08 Jan 2009 02:32:24 GMT
Subject: Re: collapsing commits with rebase
Message-ID: <20090108023224.GU21154@genesis.frugalware.org>
In-Reply-To: <200901072011.37299.bss@iguanasuicide.net>

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. ;-)