path: root/t/
diff options
authorJunio C Hamano <>2019-09-30 04:19:31 (GMT)
committerJunio C Hamano <>2019-09-30 04:19:31 (GMT)
commit640f9cd5994ed2061405aa94972b1746bb0c393e (patch)
treef86716f11cea9808256bb3be914d92b52fc1c1e3 /t/
parent026428c35eb7e4018de3707a08a7dc3d23a69712 (diff)
parent414d924beb41b9f39744b5574231856d5ffbcba8 (diff)
Merge branch 'dl/rebase-i-keep-base'
"git rebase --keep-base <upstream>" tries to find the original base of the topic being rebased and rebase on top of that same base, which is useful when running the "git rebase -i" (and its limited variant "git rebase -x"). The command also has learned to fast-forward in more cases where it can instead of replaying to recreate identical commits. * dl/rebase-i-keep-base: rebase: teach rebase --keep-base rebase tests: test linear branch topology rebase: fast-forward --fork-point in more cases rebase: fast-forward --onto in more cases rebase: refactor can_fast_forward into goto tower t3432: test for --no-ff's interaction with fast-forward t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests t3432: test rebase fast-forward behavior t3431: add rebase --fork-point tests
Diffstat (limited to 't/')
1 files changed, 1 insertions, 1 deletions
diff --git a/t/ b/t/
index 04affcc..29a3584 100755
--- a/t/
+++ b/t/
@@ -1056,7 +1056,7 @@ test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-int
git reset --hard &&
git checkout conflict-branch &&
set_fake_editor &&
- test_must_fail git rebase --onto HEAD~2 HEAD~ &&
+ test_must_fail git rebase -f --onto HEAD~2 HEAD~ &&
test_must_fail git rebase --edit-todo &&
git rebase --abort