From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2018 21:34:29 +0000 (-0800)
Subject: Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/27ebf001a10c883d40177eaf4f327f26f4d0fccc

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

27ebf001a10c883d40177eaf4f327f26f4d0fccc