undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'km/maint-doc-git-reset'

Browse Source 
* km/maint-doc-git-reset:
  doc: git-reset: make "<mode>" optional
This commit is contained in:
Jeff King 2012-11-04 08:00:33 -05:00
commit d0c6c1758b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-reset.txt
View File

@ -10,7 +10,7 @@ SYNOPSIS
[verse] [verse]
'git reset' [-q] [<commit>] [--] <paths>... 'git reset' [-q] [<commit>] [--] <paths>...
'git reset' (--patch | -p) [<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 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'' 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. 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 This form resets the current branch head to <commit> and
possibly updates the index (resetting it to the tree of <commit>) and possibly updates the index (resetting it to the tree of <commit>) and
the working tree depending on <mode>, which the working tree depending on <mode>. If <mode> is omitted,
must be one of the following: defaults to "--mixed". The <mode> must be one of the following:
+ +
-- --
--soft:: --soft::