Junio C Hamano <gitster@xxxxxxxxx> wrote: > > 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> > > Puzzled. It doesn't change anything, obviously. The patch was about showing sha1 in 40 character or 10 characters or so, in the current messages. -- 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