Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mar 17, 2017, 22:55 UTC
Message-ID: <20170317225532.GR26789@aiede.mtv.corp.google.com>
In-Reply-To: <20170317225110.13417-1-sbeller@google.com>

Hi,

Stefan Beller wrote:

> If I recall correctly, "worktree" is the feature/command, and
> "working tree" is an instance in the file system, even when you only
> have one working tree.

I'm not sure I agree with this distinction. "worktree" is just a short name for "working tree".

Unfortunately gitglossary(7) doesn't make this clear at all --- it uses the term worktree a few times (and appears to mean "working tree" when it does --- e.g.

	Pathspecs are used on the command line of [...] and many other
	commands to limit the scope of operations to some subset of
	the tree or worktree.

) but never defines it.

[...]

Show 14 quoted lines

> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -58,10 +58,10 @@ as if `-b $(basename <path>)` was specified.
>  
>  list::
>  
> -List details of each worktree.  The main worktree is listed first, followed by
> -each of the linked worktrees.  The output details include if the worktree is
> -bare, the revision currently checked out, and the branch currently checked out
> -(or 'detached HEAD' if none).
> +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 branch
> +currently checked out (or 'detached HEAD' if none).

The patch itself looks good.

Thanks, Jonathan