undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/rebase-skip-hard'

Browse Source 
* mh/rebase-skip-hard:
  Do git reset --hard HEAD when using git rebase --skip
This commit is contained in:
Junio C Hamano 2007-11-24 16:31:08 -08:00
commit 25f3cd527d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-rebase.sh
View File

@ -179,6 +179,7 @@ do
exit
;;
--skip)
git reset --hard HEAD || exit $?
if test -d "$dotest"
then
git rerere clear

2
t/t3403-rebase-skip.sh
View File

@ -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
'