From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Aug 2010 01:31:43 +0000 (-0700)
Subject: Merge branch 'tr/rfc-reset-doc'
X-Git-Tag: v1.7.3-rc0~87
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a9c6305a7c14c0d5a49c485672b60526ec082d8c;p=git.git

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

a9c6305a7c14c0d5a49c485672b60526ec082d8c