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. ;-) Oops. Yes. My mistake. -- Boyd Stephen Smith Jr. ,= ,-_-. =. bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_)) ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-' http://iguanasuicide.net/ \_/
Attachment:
signature.asc
Description: This is a digitally signed message part.
