Skip to content

Commit 2429335

Browse files
phillipwoodgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8f6aed7 commit 2429335

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

t/t3421-rebase-topology-linear.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ test_run_rebase success ''
217217
test_run_rebase success -m
218218
test_run_rebase success -i
219219
test_run_rebase failure -p
220+
test_run_rebase success --rebase-merges
220221

221222
# m
222223
# /

0 commit comments

Comments
 (0)