From: Vincent van Ravesteijn Date: Wed, 23 Nov 2011 06:44:16 +0000 (+0100) Subject: builtin-reset: Documentation update X-Git-Tag: v1.7.8-rc4~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d69bafcb36e9a5920d7a848053f070562231a96d;p=git.git builtin-reset: Documentation update The second mode of 'git reset' is defined by the --patch option, while the third mode is defined by the option. Hence, these options are mandatory in the description of the individual modes. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index b2832fc7e..b674866e6 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -9,8 +9,8 @@ SYNOPSIS -------- [verse] 'git reset' [-q] [] [--] ... -'git reset' [--patch|-p] [] [--] [...] -'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [] +'git reset' (--patch | -p) [] [--] [...] +'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [] DESCRIPTION ----------- @@ -34,7 +34,7 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' --patch|-p [] [--] [...]:: +'git reset' (--patch | -p) [] [--] [...]:: Interactively select hunks in the difference between the index and (defaults to HEAD). The chosen hunks are applied in reverse to the index. @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e. you can use it to selectively reset hunks. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `\--patch` mode. -'git reset' [--] []:: +'git reset' -- []:: This form resets the current branch head to and possibly updates the index (resetting it to the tree of ) and the working tree depending on , which