From: Björn Gustavsson Date: Sun, 22 Nov 2009 19:53:29 +0000 (+0100) Subject: apply: Use the term "working tree" consistently X-Git-Tag: v1.6.6-rc1~36^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c34ec65567793d16119c28df6ebeecfe8eb3d9f5;p=git.git apply: Use the term "working tree" consistently 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 6a07ec22a..c2528a765 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -51,7 +51,7 @@ OPTIONS --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:: @@ -59,7 +59,7 @@ OPTIONS (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.