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)
commita9c6305a7c14c0d5a49c485672b60526ec082d8c
tree4a85c6b749515e214fba81ebf172386e162782cf
parentaa8b8f40df07972fad357420415ff9bbdf22dd9e
parent6e90f7b8df5d9557e0204f047f2d47bd89d99588
Merge branch 'tr/rfc-reset-doc'

* 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