git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6366dd9 dd6fb00)
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
authorJunio C Hamano <redacted>
Wed, 10 Jan 2018 22:01:24 +0000 (14:01 -0800)
committerJunio C Hamano <redacted>
Wed, 10 Jan 2018 22:01:24 +0000 (14:01 -0800)
commitbc4efaf10306f23600649d4988eac0d4b2e216b7
tree033fc524eba3db98a96b6e0da2d0ae387739d942tree | snapshot
parent6366dd9000a3f67e47a30d94375a88dabc18ec6fcommit | diff
parentdd6fb0053ce5b6923505e64993d8061484665962commit | diff
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`
git-rebase--interactive.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT