Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:29 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:30 +0000 (13:34 -0800)
commit27ebf001a10c883d40177eaf4f327f26f4d0fccc
tree983f91dd1747ae34bb028ef29636c43bba176199
parentcca3719a5948c62f60f3dd121f6344ecaa66eec9
parented5144d7eb63a0e0e71d3b281e69e953abbf0365
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' into next

"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