| commit | 37897bfc27d3003dddf7722113e676e925fe9e21 | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Fri, 14 Dec 2018 04:53:51 +0000 (14 07:53 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Dec 2018 22:43:22 +0000 (26 14:43 -0800) | ||
| tree | 230d4d15ddc32927c306fc6bc7fd397d35bf4809 | treesnapshot (tar.gz zip) |
| parent | c812bd4669d8907186dab8aed47f2c83dfb93fff | commitdiff |
cherry-pick: do not error on non-merge commits when '-m 1' is specified
When cherry-picking multiple commits, it's impossible to have both
merge- and non-merge commits on the same command-line. Not specifying
'-m 1' results in cherry-pick refusing to handle merge commits, while
specifying '-m 1' fails on non-merge commits.
This patch allows '-m 1' for non-merge commits. As mainline is always
the only parent for a non-merge commit, it makes little sense to
disable it.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When cherry-picking multiple commits, it's impossible to have both
merge- and non-merge commits on the same command-line. Not specifying
'-m 1' results in cherry-pick refusing to handle merge commits, while
specifying '-m 1' fails on non-merge commits.
This patch allows '-m 1' for non-merge commits. As mainline is always
the only parent for a non-merge commit, it makes little sense to
disable it.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory |