Merge branch 'mz/doc-rebase-abort' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (11:41 -0700)
* mz/doc-rebase-abort:
rebase: clarify "restore the original branch"

1  2 
Documentation/git-rebase.txt
Simple merge