diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
| commit | d349e188abb88879f4c2cae9f089509b25606928 (patch) | |
| tree | 461e219f92cc27c2474b881d13c769bc773aa89d /Documentation/howto/using-merge-subtree.txt | |
| parent | Merge branch 'ld/p423' (diff) | |
| parent | sequencer: do not squash 'reword' commits when we hit conflicts (diff) | |
| download | tgif-d349e188abb88879f4c2cae9f089509b25606928.tar.xz | |
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 'Documentation/howto/using-merge-subtree.txt')
0 files changed, 0 insertions, 0 deletions