On 1/8/09, Boyd Stephen Smith Jr. <bss@xxxxxxxxxxxxxxxxx> 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@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. ;-) > Many thanks, now I have plenty of ways to think about! Cheers, Geoff. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
