Merge branch 'mz/doc-rebase-abort'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:44:08 +0000 (14:44 -0700)
commitf424d7e0b91372d98047850aa083a5e397eed57c
treefc8e8572210dac99ab9d316bfc8065577be7e0ef
parentef6663b3dbb3d63b993078477b8b21d9af64e8e5
parent5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6
Merge branch 'mz/doc-rebase-abort'

* mz/doc-rebase-abort:
  rebase: clarify "restore the original branch"
Documentation/git-rebase.txt
git-rebase.sh