diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-29 18:08:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 18:08:09 (GMT) |
| commit | 56173d28a5fb811c9525a8d5052ab6d83a07122e (patch) | |
| tree | d3a0dba51a0e6760184c4ffd7e4f2f9bdf23b8f8 /t | |
| parent | 0f57f731ea2a540a4c82b476054e8a36aebb2314 (diff) | |
| parent | 3d946165e1177905103a25aeb374e018c510e540 (diff) | |
| download | git-56173d28a5fb811c9525a8d5052ab6d83a07122e.zip git-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.gz git-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.bz2 | |
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
* pw/rebase-keep-empty-fixes:
rebase: respect --no-keep-empty
rebase -i --keep-empty: don't prune empty commits
rebase --root: stop assuming squash_onto is unset
Git 2.16.2
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3421-rebase-topology-linear.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 68fe200..52fc688 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -215,7 +215,7 @@ test_run_rebase () { } test_run_rebase success '' test_run_rebase failure -m -test_run_rebase failure -i +test_run_rebase success -i test_run_rebase failure -p # m |