summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9821e2)
raw | patch | inline | side by side (parent: f9821e2)
author | Björn Gustavsson <bgustavsson@gmail.com> | |
Sun, 22 Nov 2009 19:53:29 +0000 (20:53 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 22 Nov 2009 20:08:08 +0000 (12:08 -0800) |
The documentation for 'git apply' uses both the terms
"work tree" and "working tree". Since the glossary uses
the term "working tree", change all occurrences of
"work tree" to "working tree".
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"work tree" and "working tree". Since the glossary uses
the term "working tree", change all occurrences of
"work tree" to "working tree".
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-apply.txt | patch | blob | history |
index 6a07ec22a441e81142e02389cb5bb1c433ea13df..c2528a76545a154eb42a430b59caf26e7aad3bef 100644 (file)
--check::
Instead of applying the patch, see if the patch is
- applicable to the current work tree and/or the index
+ applicable to the current working tree and/or the index
file and detects errors. Turns off "apply".
--index::
(which is the default when none of the options that
disables it is in effect), make sure the patch is
applicable to what the current index file records. If
- the file to be patched in the work tree is not
+ the file to be patched in the working tree is not
up-to-date, it is flagged as an error. This flag also
causes the index file to be updated.