Merge branch 'mz/rebase-tests'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index ffcaf027b7544c7a8c57c54088b6e3c79b620896..0d3c57340ebf1de3f8aff05c15e05df81b173b41 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -684,7 +684,7 @@ test_expect_success 'rebase -i can copy notes' '
        test_commit n2 &&
        test_commit n3 &&
        git notes add -m"a note" n3 &&
-       git rebase --onto n1 n2 &&
+       git rebase -i --onto n1 n2 &&
        test "a note" = "$(git notes show HEAD)"
 '