From bc483285b79c880b606bdffc0fffec3850458aca Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 20 Jul 2015 01:29:18 -0400 Subject: 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 Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/gitrepository-layout.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation/gitrepository-layout.txt') 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//gitdir:: updated every time the linked repository is accessed. worktrees//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/` could be + linked working tree is gone and `worktrees/` could be removed. The file's content contains a reason string on why the repository is locked. -- cgit v1.2.3 From b07244f4c38326ed6da731aa0d4862905cd58daa Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 20 Jul 2015 01:29:21 -0400 Subject: Documentation/git-worktree: wordsmith worktree-related manpages [es: reword .git/worktrees and .git/worktrees//locked descriptions] Signed-off-by: Michael Haggerty Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/gitrepository-layout.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Documentation/gitrepository-layout.txt') diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index b53979c819..577ee844e0 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -251,25 +251,25 @@ modules:: Contains the git-repositories of the submodules. worktrees:: - Contains working tree specific information of linked + Contains administrative data for 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. + $GIT_COMMON_DIR is set, in which case + "$GIT_COMMON_DIR/worktrees" will be used instead. worktrees//gitdir:: A text file containing the absolute path back to the .git file that points to here. This is used to check if the linked repository has been manually removed and there is no need to - keep this directory any more. mtime of this file should be + keep this directory any more. The mtime of this file should be updated every time the linked repository is accessed. worktrees//locked:: If this file exists, the linked working tree may be on a - portable device and not available. It does not mean that the - linked working tree is gone and `worktrees/` could be - removed. The file's content contains a reason string on why - the repository is locked. + portable device and not available. The presence of this file + prevents `worktrees/` from being pruned either automatically + or manually by `git worktree prune`. The file may contain a string + explaining why the repository is locked. worktrees//link:: If this file exists, it is a hard link to the linked .git -- cgit v1.2.3