summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-11-04 08:00:33 -0500
committerLibravatar Jeff King <peff@peff.net>2012-11-04 08:00:33 -0500
commitd0c6c1758b281f64434c42955e22820738529a8c (patch)
tree9fa14365688088a11f7818c977b41b800e94a8ea
parentMerge branch 'tb/maint-t9200-case-insensitive' (diff)
parentdoc: git-reset: make "<mode>" optional (diff)
downloadtgif-d0c6c1758b281f64434c42955e22820738529a8c.tar.xz
Merge branch 'km/maint-doc-git-reset'
* km/maint-doc-git-reset: doc: git-reset: make "<mode>" optional
-rw-r--r--Documentation/git-reset.txt8
1 files 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] [<commit>] [--] <paths>...
'git reset' (--patch | -p) [<commit>] [--] [<paths>...]
-'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [<commit>]
+'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
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' --<mode> [<commit>]::
+'git reset' [<mode>] [<commit>]::
This form resets the current branch head to <commit> and
possibly updates the index (resetting it to the tree of <commit>) and
- the working tree depending on <mode>, which
- must be one of the following:
+ the working tree depending on <mode>. If <mode> is omitted,
+ defaults to "--mixed". The <mode> must be one of the following:
+
--
--soft::