aboutsummaryrefslogtreecommitdiff
path: root/t/t3403-rebase-skip.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:08 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-24 16:31:08 -0800
commit25f3cd527dec9909322a0f76458a0b602de61141 (patch)
tree6cac35cf7435f159c3d346a06abf05ebc633eac9 /t/t3403-rebase-skip.sh
parentfaf8280850e9af4ef63decd8d4e65a7609544c21 (diff)
parentfb6e4e1f3f048898677f3cf177bfcaf60123bd5c (diff)
downloadgit-25f3cd527dec9909322a0f76458a0b602de61141.tar.gz
git-25f3cd527dec9909322a0f76458a0b602de61141.tar.xz
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-xt/t3403-rebase-skip.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 2ee5a00ea..657f68104 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
'