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>
Phillip Wood committed
Apr 25, 2018 at 14:29 UTC
24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad
1 file changed
+1
t/t3421-rebase-topology-linear.sh
+1
@@ -217,6 +217,7 @@ test_run_rebase success ''
217
test_run_rebase success -m
218
test_run_rebase success -i
219
test_run_rebase failure -p
220
+test_run_rebase success --rebase-merges
221
222
# m
223
# /