]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b02ffe f2563c9)
Merge branch 'pw/rebase-r-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:39 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:39 +0000 (13:51 -0700)
commit3fb1d4da5e7053b54a7e82543fba679f64f72b9d
tree7d6024ba8fd6a209a165487bb0cbf1e9225d3601tree | snapshot
parent8b02ffee3f802989eb74180a907e1d60cfe4a549commit | diff
parentf2563c9ef3c028b5d4165df02fdfc0fcd613102dcommit | diff
Merge branch 'pw/rebase-r-fixes' into maint

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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.