Junio C Hamano <gitster@xxxxxxxxx> writes:
> 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/
--
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