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)
"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`.

1  2 
git-rebase--interactive.sh

Simple merge