]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ba5a0b f2563c9)
Merge branch 'pw/rebase-r-fixes'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2021 20:49:28 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2021 20:49:29 +0000 (13:49 -0700)
commit9135259b0387ce55cc9bd9671653fc33bb734b1e
tree406ce152a2e7c15c28b34362147c4a03a98a01adtree | snapshot
parent0ba5a0b3ba34270b2b57b75f4cce8454a7cc5eebcommit | diff
parentf2563c9ef3c028b5d4165df02fdfc0fcd613102dcommit | 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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.