git-worktree.txt: consistently use term "working tree"
As originally composed, git-worktree.txt employed a mix of "worktree" and "working tree" which was inconsistent and potentially confusing to readers. bc483285b7 (Documentation/git-worktree: consistently use term "linked working tree", 2015-07-20) undertook the task of employing the term "working tree" consistently throughout the document and avoiding "worktree" altogether for descriptive text. Since that time, some instances of "worktree" have crept back in. Continue the work of bc483285b7 by transforming these to "working tree", as well. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Aug 3, 2020 at 20:55 UTC
4f375b2678647175705b0840637ad4f95d8408d4
1 file changed
+11
-11
Documentation/git-worktree.txt
+11
-11
@@ -70,20 +70,20 @@ branches from there if `<branch>` is ambiguous but exists on the
70
linkgit:git-config[1].
71
+
72
If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
73
-then, as a convenience, the new worktree is associated with a branch
73
+then, as a convenience, the new working tree is associated with a branch
74
(call it `<branch>`) named after `$(basename <path>)`. If `<branch>`
75
doesn't exist, a new branch based on `HEAD` is automatically created as
76
if `-b <branch>` was given. If `<branch>` does exist, it will be
77
-checked out in the new worktree, if it's not checked out anywhere
78
-else, otherwise the command will refuse to create the worktree (unless
77
+checked out in the new working tree, if it's not checked out anywhere
78
+else, otherwise the command will refuse to create the working tree (unless
79
`--force` is used).
80
81
list::
82
83
-List details of each worktree. The main worktree is listed first, followed by
84
-each of the linked worktrees. The output details include if the worktree is
85
-bare, the revision currently checked out, and the branch currently checked out
86
-(or "detached HEAD" if none).
83
+List details of each working tree. The main working tree is listed first,
84
+followed by each of the linked working trees. The output details include
85
+if the working tree is bare, the revision currently checked out, and the
86
+branch currently checked out (or "detached HEAD" if none).
87
88
lock::
89
@@ -202,7 +202,7 @@ This can also be set up as the default behaviour by using the
202
absolute.
203
+
204
If the last path components in the working tree's path is unique among
205
-working trees, it can be used to identify worktrees. For example if
205
+working trees, it can be used to identify working trees. For example if
206
you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
207
then `ghi` or `def/ghi` is enough to point to the former working tree.
208
@@ -221,7 +221,7 @@ shared.
221
222
Refs that are per working tree can still be accessed from another
223
working tree via two special paths, `main-worktree` and `worktrees`. The
224
-former gives access to per-worktree refs of the main working tree,
224
+former gives access to per-working tree refs of the main working tree,
225
while the latter to all linked working trees.
226
227
For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good`
@@ -335,8 +335,8 @@ Porcelain Format
335
The porcelain format has a line per attribute. Attributes are listed with a
336
label and value separated by a single space. Boolean attributes (like `bare`
337
and `detached`) are listed as a label only, and are only present if and only
338
-if the value is true. The first attribute of a worktree is always `worktree`,
339
-an empty line indicates the end of the record. For example:
338
+if the value is true. The first attribute of a working tree is always
339
+`worktree`, an empty line indicates the end of the record. For example:
340
341
------------
342
$ git worktree list --porcelain