Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' into jch
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:35 +0000 (12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:35 +0000 (12:46 -0800)
commit3954ce1b3cb83f89e6082d7311c32c1e2d829fee
tree8b4fff52e12939b2d81ef566d602384fac7a740d
parent423a2fa6a7c66753a46034a441e0105c66f97967
parented5144d7eb63a0e0e71d3b281e69e953abbf0365
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' into jch

"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