Merge branch 'mz/doc-rebase-abort' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Jul 2011 18:40:55 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Jul 2011 18:40:55 +0000 (11:40 -0700)
commita1a612c571aa54d8ed4720927571ae5e650dd28c
tree15d50ef906fcb04621615f076a6cf25bf80ba3a3
parentc6fef9d322389601a8d4c204ee425e4bd8907819
parent5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6
Merge branch 'mz/doc-rebase-abort' into next

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