Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-reset.txt: point to git-checkout
author
Michael J Gruber
<git@drmicha.warpmail.net>
Wed, 15 Sep 2010 20:47:43 +0000
(22:47 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 18 Sep 2010 22:14:26 +0000
(15:14 -0700)
for the case of updating a file in index and worktree, or from the index
to the worktree.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-reset.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
06cdac5
)
diff --git
a/Documentation/git-reset.txt
b/Documentation/git-reset.txt
index 6c94f83dad8295ec25f7ccc1521a4ab4af292eae..78f3b74fa4d8b2ea1c461c1d8faf3241a531c54c 100644
(file)
--- a/
Documentation/git-reset.txt
+++ b/
Documentation/git-reset.txt
@@
-26,6
+26,13
@@
in all forms.
+
This means that `git reset <paths>` is the opposite of `git add
<paths>`.
+
This means that `git reset <paths>` is the opposite of `git add
<paths>`.
++
+After running `git reset <paths>` to update the index entry, you can
+use linkgit:git-checkout[1] to check the contents out of the index to
+the working tree.
+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 [<commit>] [--] [<paths>...]::
Interactively select hunks in the difference between the index
'git reset' --patch|-p [<commit>] [--] [<paths>...]::
Interactively select hunks in the difference between the index