diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-10 14:01:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-10 14:01:24 -0800 |
| commit | bc4efaf10306f23600649d4988eac0d4b2e216b7 (patch) | |
| tree | 033fc524eba3db98a96b6e0da2d0ae387739d942 /commit.c | |
| parent | Merge branch 'jk/doc-diff-options' (diff) | |
| parent | rebase -p: fix quoting when calling `git merge` (diff) | |
| download | git-bc4efaf10306f23600649d4988eac0d4b2e216b7.tar.gz git-bc4efaf10306f23600649d4988eac0d4b2e216b7.zip | |
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`
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions