Documentation/git-reset: reorder modes for soft-mixed-hard progression
Reorder the documetation so that the soft/mixed/hard modes are in this order. This way they form a natural progression towards changing more of the state. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
53b304224a
commit
bb59b7fffc
@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
|
'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
|
||||||
'git reset' [-q] [<commit>] [--] <paths>...
|
'git reset' [-q] [<commit>] [--] <paths>...
|
||||||
'git reset' --patch [<commit>] [--] [<paths>...]
|
'git reset' --patch [<commit>] [--] [<paths>...]
|
||||||
|
|
||||||
@ -31,17 +31,17 @@ HEAD.
|
|||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
--mixed::
|
|
||||||
Resets the index but not the working tree (i.e., the changed files
|
|
||||||
are preserved but not marked for commit) and reports what has not
|
|
||||||
been updated. This is the default action.
|
|
||||||
|
|
||||||
--soft::
|
--soft::
|
||||||
Does not touch the index file nor the working tree at all, but
|
Does not touch the index file nor the working tree at all, but
|
||||||
requires them to be in a good order. This leaves all your changed
|
requires them to be in a good order. This leaves all your changed
|
||||||
files "Changes to be committed", as 'git status' would
|
files "Changes to be committed", as 'git status' would
|
||||||
put it.
|
put it.
|
||||||
|
|
||||||
|
--mixed::
|
||||||
|
Resets the index but not the working tree (i.e., the changed files
|
||||||
|
are preserved but not marked for commit) and reports what has not
|
||||||
|
been updated. This is the default action.
|
||||||
|
|
||||||
--hard::
|
--hard::
|
||||||
Matches the working tree and index to that of the tree being
|
Matches the working tree and index to that of the tree being
|
||||||
switched to. Any changes to tracked files in the working tree
|
switched to. Any changes to tracked files in the working tree
|
||||||
|
Reference in New Issue
Block a user