From: Jonathan Nieder <jrnieder@gmail.com> To: Stefan Beller <sbeller@google.com> Cc: pclouds@gmail.com, git@vger.kernel.org Subject: Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system Date: Fri, 17 Mar 2017 15:55:32 -0700 Message-ID: <20170317225532.GR26789@aiede.mtv.corp.google.com> (raw) 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. [...] > --- 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
next prev parent reply index Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-30 20:44 [PATCH 0/4] git-prompt.sh: Full patch for submodule indicator Benjamin Fuchs 2017-01-30 20:44 ` [PATCH 1/4] git-prompt.sh: add " Benjamin Fuchs 2017-01-30 23:48 ` Junio C Hamano 2017-01-31 0:10 ` Benjamin Fuchs 2017-01-31 3:11 ` Junio C Hamano 2017-02-06 4:23 ` Stefan Beller 2017-02-06 5:55 ` Jacob Keller 2017-02-06 10:13 ` Stefan Beller 2017-01-30 20:44 ` [PATCH 2/4] git-prompt.sh: rework of " Benjamin Fuchs 2017-01-30 20:44 ` [PATCH 4/4] git-prompt.sh: add tests for " Benjamin Fuchs 2017-01-31 18:32 ` SZEDER Gábor 2017-01-31 22:06 ` Junio C Hamano 2017-01-31 22:12 ` Stefan Beller 2017-03-07 3:45 ` [RFC PATCH] rev-parse: add --show-superproject-working-tree Stefan Beller 2017-03-07 5:13 ` Junio C Hamano 2017-03-07 7:16 ` Junio C Hamano 2017-03-07 7:23 ` Junio C Hamano 2017-03-07 18:44 ` Junio C Hamano 2017-03-07 20:40 ` Stefan Beller 2017-03-07 22:49 ` Junio C Hamano 2017-03-08 0:56 ` [PATCHv2] " Stefan Beller 2017-03-08 1:30 ` Junio C Hamano 2017-03-08 6:01 ` Junio C Hamano 2017-03-08 19:20 ` [PATCHv3] " Stefan Beller 2017-03-08 22:28 ` Junio C Hamano 2017-03-08 23:07 ` [PATCHv4] " Stefan Beller 2017-03-08 23:51 ` Junio C Hamano 2017-03-17 22:28 ` Jonathan Nieder 2017-03-17 22:51 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Stefan Beller 2017-03-17 22:55 ` Jonathan Nieder [this message] 2017-03-17 23:04 ` Stefan Beller 2017-03-18 17:24 ` Junio C Hamano 2017-03-18 1:47 ` Junio C Hamano 2017-03-18 1:36 ` Junio C Hamano 2017-03-20 17:29 ` Stefan Beller 2017-03-20 18:12 ` Junio C Hamano 2017-03-20 18:50 ` Jonathan Nieder 2017-03-20 19:22 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Stefan Beller 2017-03-20 19:22 ` [PATCH 1/2] git.c: introduce --working-tree superseding --work-tree Stefan Beller 2017-03-20 19:58 ` Jonathan Nieder 2017-03-20 19:22 ` [PATCH 2/2] revparse: introduce --is-inside-working-tree Stefan Beller 2017-03-20 20:00 ` Jonathan Nieder 2017-03-20 19:37 ` [PATCH 0/2] use "working trees" instead of "worktree" in our API Junio C Hamano 2017-03-21 10:37 ` [PATCH] Documentation/git-worktree: use working tree for trees on the file system Duy Nguyen 2017-03-21 15:48 ` Junio C Hamano 2017-03-23 17:06 ` Michael J Gruber 2017-03-23 17:55 ` Junio C Hamano 2017-03-25 12:07 ` Duy Nguyen 2017-04-07 13:59 ` Michael J Gruber 2017-04-07 16:14 ` Jacob Keller 2017-03-25 12:05 ` Duy Nguyen
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170317225532.GR26789@aiede.mtv.corp.google.com \ --to=jrnieder@gmail.com \ --cc=git@vger.kernel.org \ --cc=pclouds@gmail.com \ --cc=sbeller@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox