diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-15 21:38:42 -0700 |
| commit | 0cd993a778d7c14bed34f624fce46724242557ed (patch) | |
| tree | cdd3284f5bd60e38751673953148793ccb1b79d1 /t/t3412-rebase-root.sh | |
| parent | 77f3591dbbceebfd026d087709d91cd3a9b3e8a1 (diff) | |
| parent | 994fd91d1fd5e9feffc88ab7db19e9c9461b4543 (diff) | |
| download | git-0cd993a778d7c14bed34f624fce46724242557ed.tar.gz | |
Merge branch 'cw/rebase-i-root'
"git rebase [-i] --root $tip" can now be used to rewrite all the
history down to the root.
* cw/rebase-i-root:
t3404: make test 57 work with dash and others
Add tests for rebase -i --root without --onto
rebase -i: support --root without --onto
Diffstat (limited to 't/t3412-rebase-root.sh')
| -rwxr-xr-x | t/t3412-rebase-root.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh index 1e9d1a737c..0b52105728 100755 --- a/t/t3412-rebase-root.sh +++ b/t/t3412-rebase-root.sh @@ -22,11 +22,6 @@ test_expect_success 'prepare repository' ' test_commit 4 B ' -test_expect_success 'rebase --root expects --onto' ' - git checkout -B fail other && - test_must_fail git rebase --root -' - test_expect_success 'rebase --root fails with too many args' ' git checkout -B fail other && test_must_fail git rebase --onto master --root fail fail |