Merge branch 'jh/trace2-pretty-output'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 23469cc78937eeec8aabc26c158680c2ca60dd7d..ab18ac5f28ac5e2828689d1ca4ca93b0990054c9 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -295,7 +295,7 @@ test_expect_success 'rebase --am and --show-current-patch' '
                echo two >>init.t &&
                git commit -a -m two &&
                git tag two &&
-               test_must_fail git rebase --onto init HEAD^ &&
+               test_must_fail git rebase -f --onto init HEAD^ &&
                GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
                grep "show.*$(git rev-parse two)" stderr
        )