From: Junio C Hamano Date: Tue, 20 Sep 2011 19:10:02 GMT Subject: Re: Worktree vs. working copy Message-ID: <7vhb476ned.fsf@alter.siamese.dyndns.org> In-Reply-To: Ramkumar Ramachandra writes: > Hi Carlos, > > Carlos Martín Nieto writes: >> [...] >>    $ git grep 'worktree' | wc -l >>    412 >>    $ git grep 'working copy' | grep -v ^git-cvsserver |  wc -l >>    32 >> [...] > > You might like to refer to a related discussion [1]. > > [1]: http://thread.gmane.org/gmane.comp.version-control.git/159287/focus=160083 Sorry, I do not see "working tree" discussion there. The discussion on that quoted thread was about remote-tracking branches, no? Historically, we used to say "working tree" and "worktree" more or less interchangeably, and over time we tried to update the documentation to use "working tree" consistently, even though the latter is still seen in places like "GIT_WORK_TREE" environment variable (which will _not_ change). But as far as I recall, we have never referred to the working tree controlled by a git repository as "working copy".