Merge branch 'mh/rebase-skip-hard'
commit25f3cd527dec9909322a0f76458a0b602de61141
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 00:31:08 +0000 (24 16:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 00:31:08 +0000 (24 16:31 -0800)
tree6cac35cf7435f159c3d346a06abf05ebc633eac9
parentfaf8280850e9af4ef63decd8d4e65a7609544c21
parentfb6e4e1f3f048898677f3cf177bfcaf60123bd5c
Merge branch 'mh/rebase-skip-hard'

* mh/rebase-skip-hard:
  Do git reset --hard HEAD when using git rebase --skip
git-rebase.sh
t/t3403-rebase-skip.sh