git-worktree.txt: fix minor grammatical issues
Fix a few grammatical problems to improve the reading experience. 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
ff1ce500f72c1fd7b92d2d402235dbd28d8f7bb4
1 file changed
+10
-10
Documentation/git-worktree.txt
+10
-10
@@ -82,7 +82,7 @@ list::
82
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
85
+whether 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::
@@ -171,7 +171,7 @@ This can also be set up as the default behaviour by using the
171
--lock::
172
Keep the working tree locked after creation. This is the
173
equivalent of `git worktree lock` after `git worktree add`,
174
- but without race condition.
174
+ but without a race condition.
175
176
-n::
177
--dry-run::
@@ -202,21 +202,21 @@ 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 working trees. For example if
205
+working trees, it can be used to identify a working tree. 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
209
REFS
210
----
211
In multiple working trees, some refs may be shared between all working
212
-trees, some refs are local. One example is `HEAD` is different for all
213
-working trees. This section is about the sharing rules and how to access
212
+trees and some refs are local. One example is `HEAD` which is different for each
213
+working tree. This section is about the sharing rules and how to access
214
refs of one working tree from another.
215
216
In general, all pseudo refs are per working tree and all refs starting
217
with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
218
-directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There is one
219
-exception to this: refs inside `refs/bisect` and `refs/worktree` is not
218
+directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are
219
+exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not
220
shared.
221
222
Refs that are per working tree can still be accessed from another
@@ -243,7 +243,7 @@ already present in the config file, they will be applied to the main
243
working trees only.
244
245
In order to have configuration specific to working trees, you can turn
246
-on `worktreeConfig` extension, e.g.:
246
+on the `worktreeConfig` extension, e.g.:
247
248
------------
249
$ git config extensions.worktreeConfig true
@@ -255,7 +255,7 @@ configuration in this file with `git config --worktree`. Older Git
255
versions will refuse to access repositories with this extension.
256
257
Note that in this file, the exception for `core.bare` and `core.worktree`
258
-is gone. If you have them in `$GIT_DIR/config` before, you must move
258
+is gone. If they exist in `$GIT_DIR/config`, you must move
259
them to the `config.worktree` of the main working tree. You may also
260
take this opportunity to review and move other configuration that you
261
do not want to share to all working trees:
@@ -334,7 +334,7 @@ Porcelain Format
334
~~~~~~~~~~~~~~~~
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
337
+and `detached`) are listed as a label only, and are present only
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