diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:29 -0700 |
| commit | 9135259b0387ce55cc9bd9671653fc33bb734b1e (patch) | |
| tree | 406ce152a2e7c15c28b34362147c4a03a98a01ad /quote.h | |
| parent | Merge branch 'pw/rebase-skip-final-fix' (diff) | |
| parent | rebase -r: fix merge -c with a merge strategy (diff) | |
| download | tgif-9135259b0387ce55cc9bd9671653fc33bb734b1e.tar.xz | |
Merge branch 'pw/rebase-r-fixes'
Various bugs in "git rebase -r" have been fixed.
* pw/rebase-r-fixes:
rebase -r: fix merge -c with a merge strategy
rebase -r: don't write .git/MERGE_MSG when fast-forwarding
rebase -i: add another reword test
rebase -r: make 'merge -c' behave like reword
Diffstat (limited to 'quote.h')
0 files changed, 0 insertions, 0 deletions