Merge branch 'mz/doc-rebase-abort' into maint
commitb5e104a0e69f224b89a849fa1e9b4064a36c2f4b
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (16 11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:28 +0000 (16 11:41 -0700)
tree20452ad8f672fccb4fe71b01e575934061405e85
parent22d9b7937054c90aea035afee8ebfa90bba2f7f9
parent5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6
Merge branch 'mz/doc-rebase-abort' into maint

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