Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:54 +0000 (10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:54 +0000 (10:33 -0800)
commit8b49408421bba8a928c207991bc197a226b65782
tree8f244b7ca0f0cae55ab8f7b77ea2535e4b0d2d8f
parentac0a57c0bd156738f760e2667991e66731b86b42
parented5144d7eb63a0e0e71d3b281e69e953abbf0365
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'

"git rebase -p" mangled log messages of a merge commit, which is
now fixed.

* js/fix-merge-arg-quoting-in-rebase-p:
  rebase -p: fix incorrect commit message when calling `git merge`.
git-rebase--interactive.sh