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>
Thomas Rast committed
Jul 18, 2010 at 20:23 UTC
bb59b7fffc84eb4cd6591df5a15adb5eaf7218d7
1 file changed
+6
-6
Documentation/git-reset.txt
+6
-6
@@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state
8
SYNOPSIS
9
--------
10
[verse]
11
-'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
11
+'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
12
'git reset' [-q] [<commit>] [--] <paths>...
13
'git reset' --patch [<commit>] [--] [<paths>...]
14
@@ -31,17 +31,17 @@ HEAD.
31
32
OPTIONS
33
-------
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
-
34
--soft::
35
Does not touch the index file nor the working tree at all, but
36
requires them to be in a good order. This leaves all your changed
37
files "Changes to be committed", as 'git status' would
38
put it.
39
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
+
45
--hard::
46
Matches the working tree and index to that of the tree being
47
switched to. Any changes to tracked files in the working tree