Merge branch 'mh/rebase-skip-hard'

* mh/rebase-skip-hard:
  Do git reset --hard HEAD when using git rebase --skip

diff --cc git-rebase.sh
Simple merge

diff --cc t/t3403-rebase-skip.sh
index 2ee5a00ea794e31946ee3228bc66ecc8e7d3b38f,becabfc33c6e392c9d8fca231a6d2b99b3e80a29..657f68104d52558668119234a0637ac2bca33c0a
--- 1/t/t3403-rebase-skip.sh
--- 2/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@@ -36,22 -36,8 +36,21 @@@ test_expect_failure 'rebase with git a
  '
  
  test_expect_success 'rebase --skip with am -3' '
-       git reset --hard HEAD &&
        git rebase --skip
        '
 +
 +test_expect_success 'rebase moves back to skip-reference' '
 +      test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
 +      git branch post-rebase &&
 +      git reset --hard pre-rebase &&
 +      ! git rebase master &&
 +      echo "hello" > hello &&
 +      git add hello &&
 +      git rebase --continue &&
 +      test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
 +      git reset --hard post-rebase
 +'
 +
  test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
  
  test_expect_failure 'rebase with --merge' 'git rebase --merge master'