]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: baf8ec8) | patch
rebase -r: fix merge -c with a merge strategy
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Fri, 20 Aug 2021 15:40:38 +0000 (15:40 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Aug 2021 16:36:30 +0000 (09:36 -0700)
commitf2563c9ef3c028b5d4165df02fdfc0fcd613102d
tree93aee4c76b60b58cfc6c222043e36c90048963dctree | snapshot
parentbaf8ec8d3a0327307f79efd31d5717a0c91c4d8ccommit | diff
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>
sequencer.c diff | blob | blame | history
t/t3430-rebase-merges.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.