From d505865be5c7d72abb74318940e8c4c52aa0db5f Mon Sep 17 00:00:00 2001 From: Krzysztof Mazur Date: Sun, 28 Oct 2012 15:13:27 +0100 Subject: [PATCH] doc: git-reset: make "" optional The git-reset's "" is an optional argument, however it was documented as required. The "" is documented as one of: --soft, --mixed, --hard, --merge or --keep, so "" should be used instead of "--". Signed-off-by: Krzysztof Mazur Signed-off-by: Jeff King --- Documentation/git-reset.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 117e3743a6..978d8da50c 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git reset' [-q] [] [--] ... 'git reset' (--patch | -p) [] [--] [...] -'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [] +'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [] DESCRIPTION ----------- @@ -43,11 +43,11 @@ 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 - must be one of the following: + the working tree depending on . If is omitted, + defaults to "--mixed". The must be one of the following: + -- --soft:: -- 2.11.4.GIT