Remove 'working copy' from the documentation and C code
The git term is 'working tree', so replace the most public references to 'working copy'. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlos Martín Nieto committed
Sep 20, 2011 at 22:25 UTC
f7d650c06ea3242cbf0e6ae2820d5b839ab97cd5
4 files changed
+6
-6
Documentation/config.txt
+3
-3
@@ -147,7 +147,7 @@ advice.*::
147
148
core.fileMode::
149
If false, the executable bit differences between the index and
150
- the working copy are ignored; useful on broken filesystems like FAT.
150
+ the working tree are ignored; useful on broken filesystems like FAT.
151
See linkgit:git-update-index[1].
152
+
153
The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
@@ -179,7 +179,7 @@ is created.
179
180
core.trustctime::
181
If false, the ctime differences between the index and the
182
- working copy are ignored; useful when the inode change time
182
+ working tree are ignored; useful when the inode change time
183
is regularly modified by something outside Git (file system
184
crawlers and some backup systems).
185
See linkgit:git-update-index[1]. True by default.
@@ -292,7 +292,7 @@ core.ignoreStat::
292
If true, commands which modify both the working tree and the index
293
will mark the updated paths with the "assume unchanged" bit in the
294
index. These marked files are then assumed to stay unchanged in the
295
- working copy, until you mark them otherwise manually - Git will not
295
+ working tree, until you mark them otherwise manually - Git will not
296
detect the file changes by lstat() calls. This is useful on systems
297
where those are very slow, such as Microsoft Windows.
298
See linkgit:git-update-index[1].
Documentation/git-svn.txt
+1
-1
@@ -318,7 +318,7 @@ Any other arguments are passed directly to 'git log'
318
Show what revision and author last modified each line of a file. The
319
output of this mode is format-compatible with the output of
320
`svn blame' by default. Like the SVN blame command,
321
- local uncommitted changes in the working copy are ignored;
321
+ local uncommitted changes in the working tree are ignored;
322
the version of the file in the HEAD revision is annotated. Unknown
323
arguments are passed directly to 'git blame'.
324
+
diff-lib.c
+1
-1
@@ -289,7 +289,7 @@ static void show_new_file(struct rev_info *revs,
289
290
/*
291
* New file in the index: it might actually be different in
292
- * the working copy.
292
+ * the working tree.
293
*/
294
if (get_stat_data(new, &sha1, &mode, cached, match_missing,
295
&dirty_submodule, &revs->diffopt) < 0)
merge-recursive.c
+1
-1
@@ -390,7 +390,7 @@ static void record_df_conflict_files(struct merge_options *o,
390
struct string_list *entries)
391
{
392
/* If there is a D/F conflict and the file for such a conflict
393
- * currently exist in the working copy, we want to allow it to be
393
+ * currently exist in the working tree, we want to allow it to be
394
* removed to make room for the corresponding directory if needed.
395
* The files underneath the directories of such D/F conflicts will
396
* be processed before the corresponding file involved in the D/F