Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index e7292f5b9b938018f515f858f2dadc29162261ad..d2bd7c17b01126c16d469592df191165ef618952 100755 (executable)
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -52,7 +52,7 @@ test_expect_success rebase '
        test_cmp expect actual
 
 '
-test_expect_success rebasep '
+test_expect_success REBASE_P rebasep '
 
        git checkout side-merge &&
        git rebase -p side &&