diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:49 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:49 +0900 |
| commit | d892beef52a293b271538481dbc76014672ddf09 (patch) | |
| tree | e9f7896908c60aff2a25a6fe4ac327aaaa6d6974 /t | |
| parent | Merge branch 'cb/git-gui-ttk-style' (diff) | |
| parent | rebase: respect --no-keep-empty (diff) | |
| download | tgif-d892beef52a293b271538481dbc76014672ddf09.tar.xz | |
Merge branch 'pw/rebase-keep-empty-fixes'
"git rebase --keep-empty" still removed an empty commit if the
other side contained an empty commit (due to the "does an
equivalent patch exist already?" check), which has been corrected.
* 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
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 68fe2003ef..52fc6885e5 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 |