Skip to content

Commit bb59b7f

Browse files
trastgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 53b3042 commit bb59b7f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/git-reset.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state
88
SYNOPSIS
99
--------
1010
[verse]
11-
'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
11+
'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
1212
'git reset' [-q] [<commit>] [--] <paths>...
1313
'git reset' --patch [<commit>] [--] [<paths>...]
1414

@@ -31,17 +31,17 @@ HEAD.
3131

3232
OPTIONS
3333
-------
34-
--mixed::
35-
Resets the index but not the working tree (i.e., the changed files
36-
are preserved but not marked for commit) and reports what has not
37-
been updated. This is the default action.
38-
3934
--soft::
4035
Does not touch the index file nor the working tree at all, but
4136
requires them to be in a good order. This leaves all your changed
4237
files "Changes to be committed", as 'git status' would
4338
put it.
4439

40+
--mixed::
41+
Resets the index but not the working tree (i.e., the changed files
42+
are preserved but not marked for commit) and reports what has not
43+
been updated. This is the default action.
44+
4545
--hard::
4646
Matches the working tree and index to that of the tree being
4747
switched to. Any changes to tracked files in the working tree

0 commit comments

Comments
 (0)