From: Eric Sunshine <email@example.com> To: firstname.lastname@example.org Cc: "Duy Nguyen" <email@example.com>, "Junio C Hamano" <firstname.lastname@example.org>, "Taylor Blau" <email@example.com>, "Martin Ågren" <firstname.lastname@example.org>, "Eric Sunshine" <email@example.com> Subject: [PATCH v2 3/5] git-worktree.txt: fix minor grammatical issues Date: Mon, 3 Aug 2020 20:55:33 -0400 [thread overview] Message-ID: <firstname.lastname@example.org> (raw) In-Reply-To: <email@example.com> Fix a few grammatical problems to improve the reading experience. Signed-off-by: Eric Sunshine <firstname.lastname@example.org> --- Documentation/git-worktree.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 926f4662ee..ce2d40ee4c 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -82,7 +82,7 @@ list:: 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 -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). lock:: @@ -171,7 +171,7 @@ This can also be set up as the default behaviour by using the --lock:: Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, - but without race condition. + but without a race condition. -n:: --dry-run:: @@ -202,21 +202,21 @@ This can also be set up as the default behaviour by using the absolute. + 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`, then `ghi` or `def/ghi` is enough to point to the former working tree. REFS ---- 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 -working trees. This section is about the sharing rules and how to access +trees and some refs are local. One example is `HEAD` which is different for each +working tree. This section is about the sharing rules and how to access refs of one working tree from another. 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 -directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There is one -exception to this: refs inside `refs/bisect` and `refs/worktree` is not +directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are +exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared. 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. 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 @@ -255,7 +255,7 @@ configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension. 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 take this opportunity to review and move other configuration that you 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 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 `worktree`, an empty line indicates the end of the record. For example: -- 188.8.131.52.gb10cc79966
next prev parent reply other threads:[~2020-08-04 0:56 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-03 5:36 [PATCH 0/4] git-worktree documentation cleanups Eric Sunshine 2020-08-03 5:36 ` [PATCH 1/4] git-worktree.txt: employ fixed-width typeface consistently Eric Sunshine 2020-08-03 5:36 ` [PATCH 2/4] git-worktree.txt: consistently use term "working tree" Eric Sunshine 2020-08-03 5:36 ` [PATCH 3/4] git-worktree.txt: fix minor grammatical issues Eric Sunshine 2020-08-03 5:36 ` [PATCH 4/4] git-worktree.txt: make start of new sentence more obvious Eric Sunshine 2020-08-03 16:11 ` [PATCH 0/4] git-worktree documentation cleanups Taylor Blau 2020-08-03 17:14 ` Junio C Hamano 2020-08-03 17:57 ` Martin Ågren 2020-08-03 23:54 ` Eric Sunshine 2020-08-04 0:15 ` Junio C Hamano 2020-08-04 0:55 ` [PATCH v2 0/5] " Eric Sunshine 2020-08-04 0:55 ` [PATCH v2 1/5] git-worktree.txt: employ fixed-width typeface consistently Eric Sunshine 2020-08-04 0:55 ` [PATCH v2 2/5] git-worktree.txt: consistently use term "working tree" Eric Sunshine 2020-08-04 0:55 ` Eric Sunshine [this message] 2020-08-04 0:55 ` [PATCH v2 4/5] git-worktree.txt: make start of new sentence more obvious Eric Sunshine 2020-08-04 0:55 ` [PATCH v2 5/5] git-wortkree.txt: link to man pages when citing other Git commands Eric Sunshine 2020-08-04 1:10 ` [PATCH v2 0/5] git-worktree documentation cleanups Taylor Blau 2020-08-04 4:28 ` Martin Ågren 2020-08-04 4:44 ` Eric Sunshine 2020-08-04 5:23 ` Martin Ågren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH v2 3/5] git-worktree.txt: fix minor grammatical issues' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).