Junio C Hamano <gits...@pobox.com> writes: > Elijah Newren <new...@gmail.com> writes: > >> This worries me that it'll lead to bad surprises. Perhaps some folks >> cherry-pick merges around intentionally, but I would want that to be a >> rare occurrence at most. > > We can just reject this RFC patch and we'd be in a slightly safer > place. You still need to tell us with "-m 1" on the command line > that you are picking a range with merges in it. But then I am sure > that clueless people blindly would alias "pick = cherry-pick -m1" and > use "git pick" and blindly pick ranges here and there, so I am not > sure such a slightly-more safety buys us very much.
To put it a bit differently, I share with you that picking merges should be deliberate and it is safer to make sure allowing it only when the told us that s/he knows the commit being picked is a merge, but when we started allowing "-m 1" for non-merge commits in the current world where cherry-pick can work on a range, the ship has already sailed.
