[PATCH 1/6] worktree: consistently use term "linked working tree" in manpages
Sometimes linked working trees were called "linked working directories" or "linked worktrees". Always refer to them as "linked working trees" for consistency.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
Documentation/git-worktree.txt | 10 +++++-----
Documentation/gitrepository-layout.txt | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
Show changes to 2 files +9 −9
Documentation/git-worktree.txt, Documentation/gitrepository-layout.txt
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index da71f50..c8dd0e5 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -31,9 +31,9 @@ The working tree's administrative files in the repository (see
`git worktree prune` in the main or any linked working tree to
clean up any stale administrative files.
-If you move a linked working directory to another file system, or
+If you move a linked working tree to another file system, or
within a file system that does not support hard links, you need to run
-at least one git command inside the linked working directory
+at least one git command inside the linked working tree
(e.g. `git status`) in order to update its administrative files in the
repository so that they do not get automatically pruned.
@@ -141,7 +141,7 @@ demands that you fix something immediately. You might typically use
linkgit:git-stash[1] to store your changes away temporarily, however, your
worktree is in such a state of disarray (with new, moved, and removed files,
and other bits and pieces strewn around) that you don't want to risk
-disturbing any of it. Instead, you create a temporary linked worktree to
+disturbing any of it. Instead, you create a temporary linked working tree to
make the emergency fix, remove it when done, and then resume your earlier
refactoring session.
@@ -163,10 +163,10 @@ recommended to make multiple checkouts of a superproject.
git-worktree could provide more automation for tasks currently
performed manually, such as:
-- `remove` to remove a linked worktree and its administrative files (and
+- `remove` to remove a linked working tree and its administrative files (and
warn if the worktree is dirty)
- `mv` to move or rename a worktree and update its administrative files
-- `list` to list linked worktrees
+- `list` to list linked working trees
- `lock` to prevent automatic pruning of administrative files (for instance,
for a worktree on a portable device)
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 7173b38..fe7fa96 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -252,8 +252,8 @@ modules::
worktrees::
Contains worktree specific information of linked
- checkouts. Each subdirectory contains the worktree-related
- part of a linked checkout. This directory is ignored if
+ working trees. Each subdirectory contains the worktree-related
+ part of a linked working tree. This directory is ignored if
$GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/worktrees" will be
used instead.
@@ -265,9 +265,9 @@ worktrees/<id>/gitdir::
updated every time the linked repository is accessed.
worktrees/<id>/locked::
- If this file exists, the linked repository may be on a
+ If this file exists, the linked working tree may be on a
portable device and not available. It does not mean that the
- linked repository is gone and `worktrees/<id>` could be
+ linked working tree is gone and `worktrees/<id>` could be
removed. The file's content contains a reason string on why
the repository is locked.
--
2.1.4