Hello, $ git help cherry-pick
-m parent-number, --mainline parent-number
Usually you cannot cherry-pick a merge because you do not
know which side of the merge should be considered the
mainline.
Isn't it always the case that "mainline" is the first parent, as that's
how "git merge" happens to work?
Is, say, "-m 2" ever useful?
--
Sergey
