summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2010-09-15 20:47:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-18 22:14:26 (GMT)
commit9980d7de93b1bd932f16478349dce30209070387 (patch)
tree47c09d798f5cf7d555a86fdcfa95b2123ffdfbb5 /Documentation/git-reset.txt
parent06cdac5ab61eaf129cb3a14b7538b05ca53d606f (diff)
downloadgit-9980d7de93b1bd932f16478349dce30209070387.zip
git-9980d7de93b1bd932f16478349dce30209070387.tar.gz
git-9980d7de93b1bd932f16478349dce30209070387.tar.bz2
git-reset.txt: point to git-checkout
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>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 6c94f83..78f3b74 100644
--- 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>`.
++
+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