diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-07-20 01:29:18 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:03:57 -0700 |
| commit | bc483285b79c880b606bdffc0fffec3850458aca (patch) | |
| tree | 047f1d82740a12c9e08b7df1af0bb78b21579e04 /Documentation/gitrepository-layout.txt | |
| parent | 1eaca7a5bbd2d1c418da3b3472e10a5baa06c746 (diff) | |
| download | git-bc483285b79c880b606bdffc0fffec3850458aca.tar.gz | |
Documentation/git-worktree: consistently use term "linked working tree"
Sometimes linked working trees were called "linked working
directories" or "linked worktrees". Always refer to them as "linked
working trees" for consistency.
[es: fix additional occurrences]
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitrepository-layout.txt')
| -rw-r--r-- | Documentation/gitrepository-layout.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 7173b38830..b53979c819 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -251,9 +251,9 @@ modules:: Contains the git-repositories of the submodules. worktrees:: - Contains worktree specific information of linked - checkouts. Each subdirectory contains the worktree-related - part of a linked checkout. This directory is ignored if + Contains working tree specific information of linked + working trees. Each subdirectory contains the working tree-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. |