diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 19:20:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 19:20:29 (GMT) |
| commit | d349e188abb88879f4c2cae9f089509b25606928 (patch) | |
| tree | 461e219f92cc27c2474b881d13c769bc773aa89d /pack-revindex.h | |
| parent | 6dcd36473a20e90d02463de5fe33eb94c4c33fa6 (diff) | |
| parent | a9279c678588a12485a8afa424036bdb5ad0534d (diff) | |
| download | git-d349e188abb88879f4c2cae9f089509b25606928.zip git-d349e188abb88879f4c2cae9f089509b25606928.tar.gz git-d349e188abb88879f4c2cae9f089509b25606928.tar.bz2 | |
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
Diffstat (limited to 'pack-revindex.h')
0 files changed, 0 insertions, 0 deletions