Files
git/git-rebase--interactive.sh
Junio C Hamano bc4efaf103 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`
2018-01-10 14:01:24 -08:00

28 KiB