]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
sequencer.c patch | diff1 | diff2 | blob | history

diff --cc sequencer.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.