]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3430-rebase-merges.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ab15ad1) | patch
rebase -r: always reword merge -c
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Thu, 2 May 2019 10:22:49 +0000 (11:22 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 May 2019 01:33:43 +0000 (10:33 +0900)
commit6df8df083109b1aa37824fc1ebe2347f887afe34
treea42a7136f874e9edebf44fc684a4501a5aaf913atree | snapshot
parentab15ad1a3b4b04a29415aef8c9afa2f64fc194a2commit | diff
rebase -r: always reword merge -c

If a merge can be fast-forwarded then make sure that we still edit the
commit message if the user specifies -c. The implementation follows the
same pattern that is used for ordinary rewords that are fast-forwarded.

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.