diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:31 (GMT) |
| commit | 640f9cd5994ed2061405aa94972b1746bb0c393e (patch) | |
| tree | f86716f11cea9808256bb3be914d92b52fc1c1e3 /t/t3404-rebase-interactive.sh | |
| parent | 026428c35eb7e4018de3707a08a7dc3d23a69712 (diff) | |
| parent | 414d924beb41b9f39744b5574231856d5ffbcba8 (diff) | |
| download | git-640f9cd5994ed2061405aa94972b1746bb0c393e.zip git-640f9cd5994ed2061405aa94972b1746bb0c393e.tar.gz git-640f9cd5994ed2061405aa94972b1746bb0c393e.tar.bz2 | |
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/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 04affcc..29a3584 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -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 ' |