diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-25 03:31:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-25 03:31:08 +0300 |
| commit | 25f3cd527dec9909322a0f76458a0b602de61141 (patch) | |
| tree | 6cac35cf7435f159c3d346a06abf05ebc633eac9 /t/t3403-rebase-skip.sh | |
| parent | faf8280850e9af4ef63decd8d4e65a7609544c21 (diff) | |
| parent | fb6e4e1f3f048898677f3cf177bfcaf60123bd5c (diff) | |
Merge branch 'mh/rebase-skip-hard'
* mh/rebase-skip-hard:
Do git reset --hard HEAD when using git rebase --skip
Diffstat (limited to 't/t3403-rebase-skip.sh')
| -rwxr-xr-x | t/t3403-rebase-skip.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 2ee5a00ea7..657f68104d 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -36,7 +36,6 @@ test_expect_failure 'rebase with git am -3 (default)' ' ' test_expect_success 'rebase --skip with am -3' ' - git reset --hard HEAD && git rebase --skip ' @@ -57,7 +56,6 @@ test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge' test_expect_failure 'rebase with --merge' 'git rebase --merge master' test_expect_success 'rebase --skip with --merge' ' - git reset --hard HEAD && git rebase --skip ' |