On Wed, Jan 07, 2009 at 08:11:32PM -0600, "Boyd Stephen Smith Jr." <bss@xxxxxxxxxxxxxxxxx> 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. ;-)
Attachment:
pgply1sy0Ew7m.pgp
Description: PGP signature
