diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-25 01:31:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-25 01:31:08 +0100 |
| commit | 25f3cd527dec9909322a0f76458a0b602de61141 (patch) | |
| tree | 6cac35cf7435f159c3d346a06abf05ebc633eac9 /git-rebase.sh | |
| parent | Merge branch 'cc/bisect' (diff) | |
| parent | Do git reset --hard HEAD when using git rebase --skip (diff) | |
| download | git-25f3cd527dec9909322a0f76458a0b602de61141.tar.xz git-25f3cd527dec9909322a0f76458a0b602de61141.zip | |
Merge branch 'mh/rebase-skip-hard'
* mh/rebase-skip-hard:
Do git reset --hard HEAD when using git rebase --skip
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index df5fd65d56..461ca8d93f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -179,6 +179,7 @@ do exit ;; --skip) + git reset --hard HEAD || exit $? if test -d "$dotest" then git rerere clear |