From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Jan 2018 22:01:24 +0000 (-0800)
Subject: Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
X-Git-Tag: v2.16.0-rc2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc4efaf10306f23600649d4988eac0d4b2e216b7;p=thirdparty%2Fgit.git

Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'

"git rebase -p -X<option>" did not propagate the option properly
down to underlying merge strategy backend.

* js/fix-merge-arg-quoting-in-rebase-p:
  rebase -p: fix quoting when calling `git merge`
---

bc4efaf10306f23600649d4988eac0d4b2e216b7