diff options
| author | Björn Gustavsson <bgustavsson@gmail.com> | 2009-11-22 20:53:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 12:08:08 -0800 |
| commit | c34ec65567793d16119c28df6ebeecfe8eb3d9f5 (patch) | |
| tree | de7bce0b8b0d17cdc53e110ff8ef0ca8cdacc8db | |
| parent | f9821e2b2139e5e2fbe9fde3df58ddc98ae4ce19 (diff) | |
| download | git-c34ec65567793d16119c28df6ebeecfe8eb3d9f5.tar.gz | |
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 <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-apply.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 6a07ec22a4..c2528a7654 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. |