From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Aug 2010 19:53:07 +0000 (-0700)
Subject: Merge branch 'tr/rfc-reset-doc' into maint
X-Git-Tag: v1.7.2.3~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=443938df7ba6ca8c5ad50b7b061ece8116496985;p=git.git

Merge branch 'tr/rfc-reset-doc' into maint

* 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
---

443938df7ba6ca8c5ad50b7b061ece8116496985