From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Subject: [PATCH v1 1/3] notes doc: call NOTES_MERGE_WORKTREE a "worktree", not "work tree"
Date: Tue, 11 Nov 2025 11:58:51 -0800 [thread overview]
Message-ID: <20251111195853.2511146-2-gitster@pobox.com> (raw)
In-Reply-To: <20251111195853.2511146-1-gitster@pobox.com>
As "git help glossary" says, there is "working tree" that is a
directory that holds a checkout, and there is "worktree" (one word)
that is a working tree plus repository metadata. There is no "work
tree".
The NOTES_MERGE_WORKTREE thing used by the "git notes merge" is the
latter.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
Documentation/git-notes.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-notes.adoc b/Documentation/git-notes.adoc
index 46a232ca71..8f176f9e10 100644
--- a/Documentation/git-notes.adoc
+++ b/Documentation/git-notes.adoc
@@ -282,9 +282,9 @@ NOTES MERGE STRATEGIES
----------------------
The default notes merge strategy is `manual`, which checks out
-conflicting notes in a special work tree for resolving notes conflicts
+conflicting notes in a special worktree for resolving notes conflicts
(`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the
-conflicts in that work tree.
+conflicts in that worktree.
When done, the user can either finalize the merge with
`git notes merge --commit`, or abort the merge with
`git notes merge --abort`.
--
2.52.0-rc1-455-g30608eb744
next prev parent reply other threads:[~2025-11-11 19:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-11 19:58 [PATCH v1 0/3] War on "work tree" Junio C Hamano
2025-11-11 19:58 ` Junio C Hamano [this message]
2025-11-11 19:58 ` [PATCH v1 2/3] Documentation: your checkout directory is "working tree" (part 1) Junio C Hamano
2025-11-12 6:41 ` Patrick Steinhardt
2025-11-11 19:58 ` [PATCH v1 3/3] Documentation: your checkout directory is "working tree" (part 2) Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251111195853.2511146-2-gitster@pobox.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox