diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2018-12-14 07:53:51 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-12-26 14:43:22 -0800 |
| commit | 37897bfc27d3003dddf7722113e676e925fe9e21 (patch) | |
| tree | 230d4d15ddc32927c306fc6bc7fd397d35bf4809 /tag.c | |
| parent | t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks (diff) | |
| download | tgif-37897bfc27d3003dddf7722113e676e925fe9e21.tar.xz | |
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>
Diffstat (limited to 'tag.c')
0 files changed, 0 insertions, 0 deletions