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

2017-04-07 Thread Jacob Keller
On Fri, Apr 7, 2017 at 6:59 AM, Michael J Gruber wrote: > Duy Nguyen venit, vidit, dixit 25.03.2017 13:07: >> On Fri, Mar 24, 2017 at 12:55 AM, Junio C Hamano wrote: >>> Michael J Gruber writes: >>> Are we at a point where we can still rename the new feature at least? If yes, and keepi

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

2017-04-07 Thread Michael J Gruber
Duy Nguyen venit, vidit, dixit 25.03.2017 13:07: > On Fri, Mar 24, 2017 at 12:55 AM, Junio C Hamano wrote: >> Michael J Gruber writes: >> >>> Are we at a point where we can still rename the new feature at least? If >>> yes, and keeping everything else is mandatory, than "workspace" or >>> "workin

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

2017-03-25 Thread Duy Nguyen
On Fri, Mar 24, 2017 at 12:55 AM, Junio C Hamano wrote: > Michael J Gruber writes: > >> Are we at a point where we can still rename the new feature at least? If >> yes, and keeping everything else is mandatory, than "workspace" or >> "working space" may be a serious contender for naming the new t

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

2017-03-25 Thread Duy Nguyen
On Tue, Mar 21, 2017 at 10:48 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Tue, Mar 21, 2017 at 1:50 AM, Jonathan Nieder wrote: >>> Junio C Hamano wrote: Stefan Beller writes: >>> > While it may be true that you can have bare worktrees; I would question > why anyone wants

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

2017-03-23 Thread Junio C Hamano
Michael J Gruber writes: > Are we at a point where we can still rename the new feature at least? If > yes, and keeping everything else is mandatory, than "workspace" or > "working space" may be a serious contender for naming the new thing. I do not have a good answer to the first question, but w

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

2017-03-23 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 21.03.2017 16:48: > Duy Nguyen writes: > >> On Tue, Mar 21, 2017 at 1:50 AM, Jonathan Nieder wrote: >>> Junio C Hamano wrote: Stefan Beller writes: >>> > While it may be true that you can have bare worktrees; I would question > why anyone wants to

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

2017-03-21 Thread Junio C Hamano
Duy Nguyen writes: > On Tue, Mar 21, 2017 at 1:50 AM, Jonathan Nieder wrote: >> Junio C Hamano wrote: >>> Stefan Beller writes: >> While it may be true that you can have bare worktrees; I would question why anyone wants to do this, as the only thing it provides is an additional H

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

2017-03-21 Thread Duy Nguyen
On Tue, Mar 21, 2017 at 1:50 AM, Jonathan Nieder wrote: > Junio C Hamano wrote: >> Stefan Beller writes: > >>> While it may be true that you can have bare worktrees; I would question >>> why anyone wants to do this, as the only thing it provides is an >>> additional HEAD (plus its reflog). >> >>

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

2017-03-20 Thread Jonathan Nieder
Junio C Hamano wrote: > Stefan Beller writes: >> While it may be true that you can have bare worktrees; I would question >> why anyone wants to do this, as the only thing it provides is an >> additional HEAD (plus its reflog). > > A more plausible situation is you start with a bare one as the > p

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

2017-03-20 Thread Junio C Hamano
Stefan Beller writes: > While it may be true that you can have bare worktrees; I would question > why anyone wants to do this, as the only thing it provides is an > additional HEAD (plus its reflog). A more plausible situation is you start with a bare one as the primary and used to make local cl

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

2017-03-20 Thread Stefan Beller
On Fri, Mar 17, 2017 at 6:36 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> -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, an

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

2017-03-18 Thread Junio C Hamano
Stefan Beller 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

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

2017-03-17 Thread Junio C Hamano
Stefan Beller writes: > -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

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

2017-03-17 Thread Junio C Hamano
Jonathan Nieder writes: > I'm not sure I agree with this distinction. "worktree" is just a > short name for "working tree". That is probably primarily my fault. Loong before the "git worktree" that is meant to replace the "workdir" thing in contrib/ was invented, some people said "work

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

2017-03-17 Thread Jonathan Nieder
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

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

2017-03-17 Thread Stefan Beller
On Fri, Mar 17, 2017 at 3:55 PM, Jonathan Nieder wrote: > 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

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

2017-03-17 Thread Stefan Beller
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. Using that mental model, the documentation for 'git worktree list' clearly talks about working trees, so fix it. Reflow the lines as well. Sig