Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Jan 2018 22:01:24 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Jan 2018 22:01:24 +0000 (14:01 -0800)
"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`

1  2 
git-rebase--interactive.sh
Simple merge