Merge branch 'mz/doc-rebase-abort' into maint

* mz/doc-rebase-abort: rebase: clarify "restore the original branch"

Junio C Hamano committed Aug 16, 2011 at 11:41 UTC b5e104a0e69f224b89a849fa1e9b4064a36c2f4b

No changes.