diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-08-20 15:40:38 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-23 09:36:30 -0700 |
| commit | f2563c9ef3c028b5d4165df02fdfc0fcd613102d (patch) | |
| tree | 93aee4c76b60b58cfc6c222043e36c90048963dc /sequencer.c | |
| parent | rebase -r: don't write .git/MERGE_MSG when fast-forwarding (diff) | |
| download | tgif-f2563c9ef3c028b5d4165df02fdfc0fcd613102d.tar.xz | |
rebase -r: fix merge -c with a merge strategy
If a rebase is started with a --strategy option other than "ort" or
"recursive" then "merge -c" does not allow the user to reword the
commit message.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index c2cba5ed4b..a19980f62d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3934,7 +3934,10 @@ static int do_merge(struct repository *r, strvec_pushf(&cmd.args, "-X%s", opts->xopts[k]); } - strvec_push(&cmd.args, "--no-edit"); + if (!(flags & TODO_EDIT_MERGE_MSG)) + strvec_push(&cmd.args, "--no-edit"); + else + strvec_push(&cmd.args, "--edit"); strvec_push(&cmd.args, "--no-ff"); strvec_push(&cmd.args, "--no-log"); strvec_push(&cmd.args, "--no-stat"); |