X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3403-rebase-skip.sh;h=826500bd18a520a37e3490b9deeca94fb9e14405;hb=bd9a2688454c09431101869e75c5a47f08c05b1a;hp=64446e3db3afed68e970de6fc3c0780db25c85d1;hpb=b4955fb611ce407ef0e522862c60ae0472dbfe5e;p=git.git diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 64446e3db..826500bd1 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -35,6 +35,11 @@ test_expect_success 'rebase with git am -3 (default)' ' test_must_fail git rebase master ' +test_expect_success 'rebase --skip can not be used with other options' ' + test_must_fail git rebase -v --skip && + test_must_fail git rebase --skip -v +' + test_expect_success 'rebase --skip with am -3' ' git rebase --skip '