diff options
| author | Valentin Haenel <valentin.haenel@gmx.de> | 2011-05-05 21:58:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-05 13:31:22 -0700 |
| commit | 6086ff65dfcf48237bdac6c64a85bef5d34d5b4e (patch) | |
| tree | 85d4ff8c9edd818d05086424be8d7a800486b845 /Documentation/git-reset.txt | |
| parent | a31538e273bbca23951fa70a0324ac49214d0f10 (diff) | |
| download | git-6086ff65dfcf48237bdac6c64a85bef5d34d5b4e.tar.gz | |
git-reset.txt: better docs for '--patch'
Describe '-p' as a short form of '--patch' in synopsis. Also include a better
explanation of this option and additionally refer the reader to the patch mode
description of git-add documentation.
Helped-by: Jeff King <peff@peff.net>
Mentored-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 8481f9db74..b2832fc7eb 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git reset' [-q] [<commit>] [--] <paths>... -'git reset' --patch [<commit>] [--] [<paths>...] +'git reset' [--patch|-p] [<commit>] [--] [<paths>...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION @@ -39,8 +39,9 @@ working tree in one go. and <commit> (defaults to HEAD). The chosen hunks are applied in reverse to the index. + -This means that `git reset -p` is the opposite of `git add -p` (see -linkgit:git-add[1]). +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>]:: This form resets the current branch head to <commit> and |