![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Aug 2010 19:53:07 +0000 (12:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Aug 2010 19:53:07 +0000 (12:53 -0700) | ||
| commit | 443938df7ba6ca8c5ad50b7b061ece8116496985 | |
| tree | 9480e5b74b019fe9717cd266f5d50fa139269cf2 | tree | snapshot |
| parent | 8bd9fd50014424643bddfde51423d42e0fc60800 | commit | diff |
| parent | 6e90f7b8df5d9557e0204f047f2d47bd89d99588 | commit | diff |
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
* 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