From: Junio C Hamano <redacted>
Date: Tue, 27 Feb 2018 18:33:54 +0000 (-0800)
Subject: Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=8b49408421bba8a928c207991bc197a226b65782;p=git.git

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

8b49408421bba8a928c207991bc197a226b65782