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)
commitd349e188abb88879f4c2cae9f089509b25606928
tree461e219f92cc27c2474b881d13c769bc773aa89d
parent6dcd36473a20e90d02463de5fe33eb94c4c33fa6
parenta9279c678588a12485a8afa424036bdb5ad0534d
Merge branch 'pw/rebase-i-keep-reword-after-conflict'

Bugfix for "rebase -i" corner case regression.

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