diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 23:49:29 +0300 |
| commit | 9135259b0387ce55cc9bd9671653fc33bb734b1e (patch) | |
| tree | 406ce152a2e7c15c28b34362147c4a03a98a01ad /contrib | |
| parent | 0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eeb (diff) | |
| parent | f2563c9ef3c028b5d4165df02fdfc0fcd613102d (diff) | |
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 'contrib')
0 files changed, 0 insertions, 0 deletions