[PATCH 3/4] apply: Use the term "working tree" consistently

[PATCH 3/4] apply: Use the term "working tree" consistently

[Björn Gustavsson]

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>
---
 Documentation/git-apply.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 6857a68..8349373 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -21,7 +21,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Reads supplied 'diff' output and applies it on a git index file
-and a work tree.
+and a working tree.
 
 'git-apply' can also be used outside a git repository as long
 as no options that require a git repository are given
@@ -52,7 +52,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::
@@ -60,7 +60,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.
 
-- 
1.6.5.3.298.g39add

Re: [PATCH 3/4] apply: Use the term "working tree" consistently

[Junio C Hamano]

Björn Gustavsson <bgustavsson@gmail.com> writes:

> 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".

Consistency is good.

I'd personally vote for fixing it the other way around starting from the
glossary, though.