Junio C Hamano 9135259b03 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

2021-09-03 13:49:29 -07:00

163 KiB

Raw Blame History

View Raw