diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-05-02 11:22:49 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:33:43 +0900 |
| commit | 6df8df083109b1aa37824fc1ebe2347f887afe34 (patch) | |
| tree | a42a7136f874e9edebf44fc684a4501a5aaf913a /contrib/fast-import/git-import.sh | |
| parent | Git 2.22-rc0 (diff) | |
| download | tgif-6df8df083109b1aa37824fc1ebe2347f887afe34.tar.xz | |
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>
Diffstat (limited to 'contrib/fast-import/git-import.sh')
0 files changed, 0 insertions, 0 deletions