/ uis / git / x / uis / git / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dcd364 a9279c6)
Merge branch 'pw/rebase-i-keep-reword-after-conflict'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000 (12:20 -0700)
Bugfix for "rebase -i" corner case regression.

* pw/rebase-i-keep-reword-after-conflict:
  sequencer: do not squash 'reword' commits when we hit conflicts

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

diff --cc sequencer.c
Simple merge
Local mirror of git