From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 18:33:54 +0000 (-0800)
Subject: Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
X-Git-Tag: v2.17.0-rc0~75
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8b49408421bba8a928c207991bc197a226b65782?ds=inline;hp=--cc

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