Merge branch 'tr/rfc-reset-doc' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:32 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Aug 2010 21:22:32 +0000 (14:22 -0700)
commit8e7c8d146499feb55e416137aeaae5f6fea979c1
treed8afcabe64df5a2678faa73a05e2b8cc865f3557
parent333f9df0b23229b811f85f71e4cfaae69bd09ee9
parent6e90f7b8df5d9557e0204f047f2d47bd89d99588
Merge branch 'tr/rfc-reset-doc' into next

* 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