Merge branch 'tr/rfc-reset-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:31:43 +0000 (18:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:31:43 +0000 (18:31 -0700)
* tr/rfc-reset-doc:
Documentation/reset: move "undo permanently" example behind "make topic"
Documentation/reset: reorder examples to match description
Documentation/reset: promote 'examples' one section up
Documentation/reset: separate options by mode
Documentation/git-reset: reorder modes for soft-mixed-hard progression

Trivial merge