Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pw/rebase-i-keep-reword-after-conflict'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Jul 2018 19:20:29 +0000
(12:20 -0700)
committer
Junio 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
raw
|
combined
(merge:
6dcd364
a9279c6
)
diff --cc
sequencer.c
Simple merge