summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.5.0.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-18 12:20:29 -0700
commitd349e188abb88879f4c2cae9f089509b25606928 (patch)
tree461e219f92cc27c2474b881d13c769bc773aa89d /Documentation/RelNotes/1.5.0.txt
parentMerge branch 'ld/p423' (diff)
parentsequencer: do not squash 'reword' commits when we hit conflicts (diff)
downloadtgif-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/RelNotes/1.5.0.txt')
0 files changed, 0 insertions, 0 deletions