]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3421-rebase-topology-linear.sh
rebase --rebase-merges: add test for --keep-empty
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 25 Apr 2018 12:29:14 +0000 (14:29 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2018 03:28:43 +0000 (12:28 +0900)
commit24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad
tree4cbb663956524757f613d8dd887f94e2fdbf681d
parent8f6aed71d27f33096449d28c4711d3b68159632e
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>
t/t3421-rebase-topology-linear.sh