diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-04-25 14:29:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 12:28:43 +0900 |
| commit | 24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad (patch) | |
| tree | 4cbb663956524757f613d8dd887f94e2fdbf681d /t/t3421-rebase-topology-linear.sh | |
| parent | 8f6aed71d27f33096449d28c4711d3b68159632e (diff) | |
| download | git-24293359ccf8a7bc2ac68a9b9bf61d6b59c873ad.tar.gz git-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 't/t3421-rebase-topology-linear.sh')
| -rwxr-xr-x | t/t3421-rebase-topology-linear.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index b078f9304..e7438ad06 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -217,6 +217,7 @@ test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_run_rebase failure -p +test_run_rebase success --rebase-merges # m # / |