builtin-reset: Documentation update
The second mode of 'git reset' is defined by the --patch option, while the third mode is defined by the <mode> option. Hence, these options are mandatory in the description of the individual modes. Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vincent van Ravesteijn committed
Nov 23, 2011 at 07:44 UTC
d69bafcb36e9a5920d7a848053f070562231a96d
1 file changed
+4
-4
Documentation/git-reset.txt
+4
-4
@@ -9,8 +9,8 @@ SYNOPSIS
9
--------
10
[verse]
11
'git reset' [-q] [<commit>] [--] <paths>...
12
-'git reset' [--patch|-p] [<commit>] [--] [<paths>...]
13
-'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
12
+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]
13
+'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [<commit>]
14
15
DESCRIPTION
16
-----------
@@ -34,7 +34,7 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you
34
can copy the contents of a path out of a commit to the index and to the
35
working tree in one go.
36
37
-'git reset' --patch|-p [<commit>] [--] [<paths>...]::
37
+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]::
38
Interactively select hunks in the difference between the index
39
and <commit> (defaults to HEAD). The chosen hunks are applied
40
in reverse to the index.
@@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.
43
you can use it to selectively reset hunks. See the ``Interactive Mode''
44
section of linkgit:git-add[1] to learn how to operate the `\--patch` mode.
45
46
-'git reset' [--<mode>] [<commit>]::
46
+'git reset' --<mode> [<commit>]::
47
This form resets the current branch head to <commit> and
48
possibly updates the index (resetting it to the tree of <commit>) and
49
the working tree depending on <mode>, which