development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues 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
parent faf8280850 fb6e4e1f3f
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
'