* [PATCH 4/4] apply: Use the term "working tree" consistently
@ 2009-11-22 19:53 Björn Gustavsson
0 siblings, 0 replies; only message in thread
From: Björn Gustavsson @ 2009-11-22 19:53 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
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>
---
Junio wrote that he personally would vote for changing
it the other way around starting from the glossary.
"Work tree" feels fine for me (and is shorter than
"working tree"), but I am not a native speaker.
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 6a07ec2..c2528a7 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.
--
1.6.5.3.298.g39add
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-11-22 19:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-22 19:53 [PATCH 4/4] apply: Use the term "working tree" consistently Björn Gustavsson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.