git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/6] worktree: consistently use term "linked working tree" in manpages

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 19, 2015, 02:54 UTC
Message-ID
<CAPig+cSYO5FOXpbbA6sTSTFX0TB9mXaNu+1K7nvYHDncoOwJ6g@mail.gmail.com>
In-Reply-To
<097393a343401706ac8041eb01a9e61949a31d2d.1437271363.git.mhagger@alum.mit.edu>
On Sat, Jul 18, 2015 at 10:10 PM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
Show 13 quoted lines
> Sometimes linked working trees were called "linked working
> directories" or "linked worktrees". Always refer to them as "linked
> working trees" for consistency.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index da71f50..c8dd0e5 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -141,7 +141,7 @@ demands that you fix something immediately. You might typically use
>  linkgit:git-stash[1] to store your changes away temporarily, however, your
>  worktree is in such a state of disarray (with new, moved, and removed files,

Was your intention to replace all instances of "worktree" with "working tree" or just some? If only some, what is the criteria by which you decide? I ask because several instances of "worktree" (such as the one above) remain even after this patch.

Show 5 quoted lines
>  and other bits and pieces strewn around) that you don't want to risk
> -disturbing any of it. Instead, you create a temporary linked worktree to
> +disturbing any of it. Instead, you create a temporary linked working tree to
>  make the emergency fix, remove it when done, and then resume your earlier
>  refactoring session.
Previous: Michael HaggertyNext: Michael Haggerty
Message 3 of 14 in “Various tweaks to 'worktree'-related manpages”
  1. 0/6 Various tweaks to 'worktree'-related manpagesMichael Haggerty, Jul 19, 2015
  2. 1/6 worktree: consistently use term "linked working tree" in manpagesMichael Haggerty, Jul 19, 2015
  3. Eric SunshineJul 19, 2015
  4. 2/6 worktree: remove references to "git checkout --to" from the manpageMichael Haggerty, Jul 19, 2015
  5. Eric SunshineJul 19, 2015
  6. 3/6 worktree: fix incorrect references to file "locked"Michael Haggerty, Jul 19, 2015
  7. Eric SunshineJul 19, 2015
  8. 4/6 worktree: the "locked" mechanism is already implementedMichael Haggerty, Jul 19, 2015
  9. Eric SunshineJul 19, 2015
  10. 5/6 config.txt: refer to "git worktree prune", not "prune --worktree"Michael Haggerty, Jul 19, 2015
  11. Eric SunshineJul 19, 2015
  12. 6/6 worktree: wordsmith worktree-related manpagesMichael Haggerty, Jul 19, 2015
  13. Eric SunshineJul 19, 2015
  14. Eric SunshineJul 19, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.