diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:51 +0900 |
| commit | 850e9257525ef2fa13e1d34ccce4e6b73085bb4e (patch) | |
| tree | 9de3df7ba23ef1db1b95d1a51d98f00ce784711f /t/t3421-rebase-topology-linear.sh | |
| parent | Merge branch 'pw/rebase-keep-empty-fixes' (diff) | |
| parent | rebase --keep-empty: always use interactive rebase (diff) | |
| download | tgif-850e9257525ef2fa13e1d34ccce4e6b73085bb4e.tar.xz | |
Merge branch 'pw/rebase-signoff'
"git rebase" has learned to honor "--signoff" option when using
backends other than "am" (but not "--preserve-merges").
* pw/rebase-signoff:
rebase --keep-empty: always use interactive rebase
rebase -p: error out if --signoff is given
rebase: extend --signoff support
Diffstat (limited to 't/t3421-rebase-topology-linear.sh')
| -rwxr-xr-x | t/t3421-rebase-topology-linear.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 52fc6885e5..b078f93046 100755 --- a/t/t3421-rebase-topology-linear.sh +++ b/t/t3421-rebase-topology-linear.sh @@ -199,7 +199,7 @@ test_run_rebase () { " } test_run_rebase success '' -test_run_rebase failure -m +test_run_rebase success -m test_run_rebase success -i test_run_rebase failure -p @@ -214,7 +214,7 @@ test_run_rebase () { " } test_run_rebase success '' -test_run_rebase failure -m +test_run_rebase success -m test_run_rebase success -i test_run_rebase failure -p |