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 /t/t7605-merge-resolve.sh | |
| 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 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions