summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.5.4.txt
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2018-04-25 14:29:14 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-26 12:28:43 +0900
commit24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad (patch)
tree4cbb663956524757f613d8dd887f94e2fdbf681d /Documentation/RelNotes/1.6.5.4.txt
parentrebase: introduce the --rebase-merges option (diff)
downloadtgif-24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad.tar.xz
rebase --rebase-merges: add test for --keep-empty
If there are empty commits on the left hand side of $upstream...HEAD then the empty commits on the right hand side that we want to keep are being pruned. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.6.5.4.txt')
0 files changed, 0 insertions, 0 deletions