]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51d6c0f 6df8df0)
Merge branch 'pw/rebase-edit-message-for-replayed-merge'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:43 +0000 (13:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2019 20:19:43 +0000 (13:19 -0700)
commitc51026115481834a1e0f49a2dafc1ce86025889c
tree90967e8a7b8d6c9172c425fbb6ee958af230d2fctree | snapshot
parent51d6c0f0159a7f8ec02bc5a095172cee857b4e3acommit | diff
parent6df8df083109b1aa37824fc1ebe2347f887afe34commit | diff
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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.