зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
4f375b2678
Коммит
ff1ce500f7
|
@ -82,7 +82,7 @@ list::
|
||||||
|
|
||||||
List details of each working tree. The main working tree is listed first,
|
List details of each working tree. The main working tree is listed first,
|
||||||
followed by each of the linked working trees. The output details include
|
followed by each of the linked working trees. The output details include
|
||||||
if the working tree is bare, the revision currently checked out, and the
|
whether the working tree is bare, the revision currently checked out, and the
|
||||||
branch currently checked out (or "detached HEAD" if none).
|
branch currently checked out (or "detached HEAD" if none).
|
||||||
|
|
||||||
lock::
|
lock::
|
||||||
|
@ -171,7 +171,7 @@ This can also be set up as the default behaviour by using the
|
||||||
--lock::
|
--lock::
|
||||||
Keep the working tree locked after creation. This is the
|
Keep the working tree locked after creation. This is the
|
||||||
equivalent of `git worktree lock` after `git worktree add`,
|
equivalent of `git worktree lock` after `git worktree add`,
|
||||||
but without race condition.
|
but without a race condition.
|
||||||
|
|
||||||
-n::
|
-n::
|
||||||
--dry-run::
|
--dry-run::
|
||||||
|
@ -202,21 +202,21 @@ This can also be set up as the default behaviour by using the
|
||||||
absolute.
|
absolute.
|
||||||
+
|
+
|
||||||
If the last path components in the working tree's path is unique among
|
If the last path components in the working tree's path is unique among
|
||||||
working trees, it can be used to identify working trees. For example if
|
working trees, it can be used to identify a working tree. For example if
|
||||||
you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
|
you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
|
||||||
then `ghi` or `def/ghi` is enough to point to the former working tree.
|
then `ghi` or `def/ghi` is enough to point to the former working tree.
|
||||||
|
|
||||||
REFS
|
REFS
|
||||||
----
|
----
|
||||||
In multiple working trees, some refs may be shared between all working
|
In multiple working trees, some refs may be shared between all working
|
||||||
trees, some refs are local. One example is `HEAD` is different for all
|
trees and some refs are local. One example is `HEAD` which is different for each
|
||||||
working trees. This section is about the sharing rules and how to access
|
working tree. This section is about the sharing rules and how to access
|
||||||
refs of one working tree from another.
|
refs of one working tree from another.
|
||||||
|
|
||||||
In general, all pseudo refs are per working tree and all refs starting
|
In general, all pseudo refs are per working tree and all refs starting
|
||||||
with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
|
with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
|
||||||
directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There is one
|
directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are
|
||||||
exception to this: refs inside `refs/bisect` and `refs/worktree` is not
|
exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not
|
||||||
shared.
|
shared.
|
||||||
|
|
||||||
Refs that are per working tree can still be accessed from another
|
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
|
||||||
working trees only.
|
working trees only.
|
||||||
|
|
||||||
In order to have configuration specific to working trees, you can turn
|
In order to have configuration specific to working trees, you can turn
|
||||||
on `worktreeConfig` extension, e.g.:
|
on the `worktreeConfig` extension, e.g.:
|
||||||
|
|
||||||
------------
|
------------
|
||||||
$ git config extensions.worktreeConfig true
|
$ git config extensions.worktreeConfig true
|
||||||
|
@ -255,7 +255,7 @@ configuration in this file with `git config --worktree`. Older Git
|
||||||
versions will refuse to access repositories with this extension.
|
versions will refuse to access repositories with this extension.
|
||||||
|
|
||||||
Note that in this file, the exception for `core.bare` and `core.worktree`
|
Note that in this file, the exception for `core.bare` and `core.worktree`
|
||||||
is gone. If you have them in `$GIT_DIR/config` before, you must move
|
is gone. If they exist in `$GIT_DIR/config`, you must move
|
||||||
them to the `config.worktree` of the main working tree. You may also
|
them to the `config.worktree` of the main working tree. You may also
|
||||||
take this opportunity to review and move other configuration that you
|
take this opportunity to review and move other configuration that you
|
||||||
do not want to share to all working trees:
|
do not want to share to all working trees:
|
||||||
|
@ -334,7 +334,7 @@ Porcelain Format
|
||||||
~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~
|
||||||
The porcelain format has a line per attribute. Attributes are listed with a
|
The porcelain format has a line per attribute. Attributes are listed with a
|
||||||
label and value separated by a single space. Boolean attributes (like `bare`
|
label and value separated by a single space. Boolean attributes (like `bare`
|
||||||
and `detached`) are listed as a label only, and are only present if and only
|
and `detached`) are listed as a label only, and are present only
|
||||||
if the value is true. The first attribute of a working tree is always
|
if the value is true. The first attribute of a working tree is always
|
||||||
`worktree`, an empty line indicates the end of the record. For example:
|
`worktree`, an empty line indicates the end of the record. For example:
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче