From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Mar 2017 17:24:17 GMT
Subject: Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system
Message-ID: <xmqqo9wy4hxa.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CAGZ79kaL=mHsqURqrnUMav8W=Hr960PHw6WDoBncVZA4AjmsJA@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

>> 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.
>
> So maybe it's time to look for volunteers for a cleanup patch. ;)
> I tried finding the discussion on worktree vs "working tree"
> and did not succeed. :/

A rough rule of thumb.  Anything that was written before 2014 or
back when nobody knew df0b6cfb ("worktree: new place for "git prune
--worktrees"", 2015-06-29) was coming that says "worktree" is using
the term to refer to what we call "working tree" these days.

What Jonathan quoted above came from 3bd2bcfa ("glossary: define
pathspec", 2010-12-15) and certainly predates the one that replaced
contrib/workdir, so we should update it to read "working tree".