summaryrefslogtreecommitdiff
path: root/contrib/fast-import/import-directories.perl
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:43 -0700
commitc51026115481834a1e0f49a2dafc1ce86025889c (patch)
tree90967e8a7b8d6c9172c425fbb6ee958af230d2fc /contrib/fast-import/import-directories.perl
parentMerge branch 'ab/deprecate-R-for-dynpath' (diff)
parentrebase -r: always reword merge -c (diff)
downloadtgif-c51026115481834a1e0f49a2dafc1ce86025889c.tar.xz
Merge branch 'pw/rebase-edit-message-for-replayed-merge'
A "merge -c" instruction during "git rebase --rebase-merges" should give the user a chance to edit the log message, even when there is otherwise no need to create a new merge and replace the existing one (i.e. fast-forward instead), but did not. Which has been corrected. * pw/rebase-edit-message-for-replayed-merge: rebase -r: always reword merge -c
Diffstat (limited to 'contrib/fast-import/import-directories.perl')
0 files changed, 0 insertions, 0 deletions