git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michal Suchánek" <msuchanek@suse.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
	Sergey Organov <sorganov@gmail.com>,
	Ben Knoble <ben.knoble@gmail.com>,
	Jason Cho <jason11choca@proton.me>,
	"Jakub T. Jankiewicz" <jcubic@jcubic.pl>
Subject: Re: [PATCH 1/2] doc: git-worktree: Link to examples
Date: Thu, 2 Oct 2025 20:55:42 +0200	[thread overview]
Message-ID: <aN7KrnF0KohlKtuN@kitsune.suse.cz> (raw)
In-Reply-To: <xmqqo6qpw655.fsf@gitster.g>

On Thu, Oct 02, 2025 at 10:44:06AM -0700, Junio C Hamano wrote:
> Michal Suchanek <msuchanek@suse.de> writes:
> 
> > Also add advice to put new worktrees outside of existing ones.
> >
> > Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> > ---
> >  Documentation/git-worktree.adoc | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/git-worktree.adoc b/Documentation/git-worktree.adoc
> > index 389e669ac0..ec31863aec 100644
> > --- a/Documentation/git-worktree.adoc
> > +++ b/Documentation/git-worktree.adoc
> > @@ -79,6 +79,9 @@ with a matching name, treat as equivalent to:
> >  $ git worktree add --track -b <branch> <path> <remote>/<branch>
> >  ------------
> >  +
> > +For best results it is advised to specify <path> outside of the repository and
> > +existing worktrees - see <<EXAMPLES>>
> > ++
> 
> I am wondering if we cram more information in "For best results", by
> adding the "otherwise...".  Here is my (failed) attempt.
> 
>     Use <path> outside of your working tree and existing worktrees
>     (see <<EXAMPLES>>); otherwise your new worktree will appear as
>     an untracked directory.
> 
> I say "failed" as the above phrasing makes it sound as if that
> untracked-ness is the only downside, and also by omitting "advised",
> it makes it sound as if there is no upside (other than inertia) in
> doing so.
> 
> So, I'll (atleast tentatively) queue yours as-is.

Yes, I did not want to make this explanation too long. Spelling out all
the details would take multiple paragraphs but it's probably not worth
being that verbose.

> >  If the branch exists in multiple remotes and one of them is named by
> >  the `checkout.defaultRemote` configuration variable, we'll use that
> >  one for the purposes of disambiguation, even if the `<branch>` isn't
> > @@ -502,8 +505,8 @@ locked "reason\nwhy is locked"
> >  ...
> >  ------------
> >  
> > -EXAMPLES
> > ---------
> > +[[EXAMPLES]]EXAMPLES
> > +--------------------
> 
> cf. https://lore.kernel.org/git/5044672.31r3eYUQgx@cayenne/
> 
> IOW, we probably should write this more like ...
> 
>         +[[EXAMPLES]]
>          EXAMPLES
>          --------

That could use correcting in the the asciidoc documentation. The
examples there put the anchor on the same line.

That's probably where the repeated problem of this formatting is coming
from.

The other thing is that if you used sections you would get anchors
automatically for free avoiding this problem altogether.

Thanks

Michal

  reply	other threads:[~2025-10-02 18:55 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-27 13:28 What is the reason behind not hiding git worktrees from git? Jakub T. Jankiewicz
2025-09-27 16:52 ` Junio C Hamano
2025-09-27 17:55   ` Michal Suchánek
2025-09-27 21:08     ` Jason Cho
2025-09-27 21:26       ` Jason Cho
2025-09-30 10:30         ` Michal Suchánek
2025-09-30 15:47           ` Junio C Hamano
2025-11-19  8:13             ` Michal Suchánek
2025-09-30 10:37       ` Michal Suchánek
2025-10-01 12:16         ` Ben Knoble
2025-10-01 18:54           ` Junio C Hamano
2025-10-01 20:22             ` Sergey Organov
2025-10-01 20:48               ` Junio C Hamano
2025-10-01 21:27                 ` Jakub T. Jankiewicz
2025-10-01 22:07                   ` Junio C Hamano
2025-10-01 21:29                 ` Eric Sunshine
2025-10-01 22:27                   ` Junio C Hamano
2025-10-02  8:38                     ` Michal Suchánek
2025-10-02 13:33                       ` Junio C Hamano
2025-10-02 15:51                         ` [PATCH 1/2] doc: git-worktree: Link to examples Michal Suchanek
2025-10-02 17:42                           ` Kristoffer Haugsbakk
2025-10-02 17:44                           ` Junio C Hamano
2025-10-02 18:55                             ` Michal Suchánek [this message]
2025-10-05 20:52                           ` Jean-Noël AVILA
2025-10-10 17:10                             ` Michal Suchánek
2025-10-10 17:04                           ` [PATCH v2 " Michal Suchanek
2025-10-11  4:40                             ` Eric Sunshine
2025-10-10 17:04                           ` [PATCH v2 2/2] doc: git-worktree: Add side by side branch checkout example Michal Suchanek
2025-10-11  5:17                             ` Eric Sunshine
2025-10-23 19:40                               ` Junio C Hamano
2025-10-24 10:15                               ` Michal Suchánek
2025-10-24 16:57                                 ` Eric Sunshine
2025-11-18 12:01                                   ` Michal Suchánek
2025-11-19  7:19                                     ` Eric Sunshine
2025-10-02 15:51                         ` [PATCH " Michal Suchanek
2025-10-02 17:51                           ` Kristoffer Haugsbakk
2025-10-02 18:46                             ` Michal Suchánek
2025-10-02 18:47                             ` Junio C Hamano
2025-10-02 18:06                           ` Junio C Hamano
2025-10-02 18:39                             ` Michal Suchánek
2025-11-17 22:36                   ` What is the reason behind not hiding git worktrees from git? Johannes Schindelin
2025-11-17 22:57                     ` Junio C Hamano
2025-10-02  2:33             ` Ben Knoble

Reply instructions:

You may reply publicly 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aN7KrnF0KohlKtuN@kitsune.suse.cz \
    --to=msuchanek@suse.de \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jason11choca@proton.me \
    --cc=jcubic@jcubic.pl \
    --cc=sorganov@gmail.com \
    --cc=sunshine@sunshineco.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).