git-reset.txt: use "working tree" consistently
as per git help glossary Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Sep 15, 2010 at 22:47 UTC
06cdac5ab61eaf129cb3a14b7538b05ca53d606f
1 file changed
+7
-7
Documentation/git-reset.txt
+7
-7
@@ -16,12 +16,12 @@ DESCRIPTION
16
-----------
17
In the first and second form, copy entries from <commit> to the index.
18
In the third form, set the current branch head to <commit>, optionally
19
-modifying index and worktree to match. The <commit> defaults to HEAD
19
+modifying index and working tree to match. The <commit> defaults to HEAD
20
in all forms.
21
22
'git reset' [-q] [<commit>] [--] <paths>...::
23
This form resets the index entries for all <paths> to their
24
- state at the <commit>. (It does not affect the worktree, nor
24
+ state at the <commit>. (It does not affect the working tree, nor
25
the current branch.)
26
+
27
This means that `git reset <paths>` is the opposite of `git add
@@ -184,7 +184,7 @@ tip of the current branch in ORIG_HEAD, so resetting hard to it
184
brings your index file and the working tree back to that state,
185
and resets the tip of the branch to that commit.
186
187
-Undo a merge or pull inside a dirty work tree::
187
+Undo a merge or pull inside a dirty working tree::
188
+
189
------------
190
$ git pull <1>
@@ -257,7 +257,7 @@ Suppose you are working on something and you commit it, and then you
257
continue working a bit more, but now you think that what you have in
258
your working tree should be in another branch that has nothing to do
259
with what you committed previously. You can start a new branch and
260
-reset it while keeping the changes in your work tree.
260
+reset it while keeping the changes in your working tree.
261
+
262
------------
263
$ git tag start
@@ -348,11 +348,11 @@ in state D).
348
--keep B C C
349
350
"reset --merge" is meant to be used when resetting out of a conflicted
351
-merge. Any mergy operation guarantees that the work tree file that is
351
+merge. Any mergy operation guarantees that the working tree file that is
352
involved in the merge does not have local change wrt the index before
353
-it starts, and that it writes the result out to the work tree. So if
353
+it starts, and that it writes the result out to the working tree. So if
354
we see some difference between the index and the target and also
355
-between the index and the work tree, then it means that we are not
355
+between the index and the working tree, then it means that we are not
356
resetting out from a state that a mergy operation left after failing
357
with a conflict. That is why we disallow --merge option in this case.
358