Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> I am not sure how that changes anything.
>
> $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
> error: that commit is a merge and you didn't give me -m <which-parent>
>
> $ git cherry-pick 38e70713119c25ab5699df6b2fb13e4133d399ab
> error: the commit 38e707... is a merge and you didn't give me -m <which-parent>
But ...
./myscript.sh
error: that commit is a merge and you didn't give me -m <which-parent>--
Matthieu Moy
http://www-verimag.imag.fr/~moy/