git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rev-parse: documentation adjustment - mention remote tracking with @{u}

From
Tao Klerks <tao@klerks.biz>
Date
Jun 23, 2022, 04:37 UTC
Message-ID
<CAPMMpojn3BfwJJ_CqtM=PXaXvErV11ZGcopmGdbiKMDymZ=DVA@mail.gmail.com>
In-Reply-To
<xmqqbkumhtur.fsf@gitster.g>
On Tue, Jun 21, 2022 at 6:19 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
>
> "Tao Klerks via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > ... As `branch.<name>.merge` is the branch path on the
> > +  remote, it is first converted to a local tracking branch (i.e., something in
> > +  `refs/remotes/`).
>
> Let's correct it to "remote-tracking branch".
>
> But more importantly, the order of explanation feels a bit
> backwards. Something like...
>
>     A branch B may be set up to build on top of a branch X
>     (configured with `branch.<name>.merge`) at a remote R
>     (configured with `branch.<name>.remote`).  B@{u} refers to the
>     remote-tracking branch for the branch X taken from remote R,
>     typically found at `refs/remotes/R/X`.
>
> ... to cover both of the above, perhaps, may flow more naturally?
>

Looks great, thanks! I feel like a bit of a fraud signing my name to it now, but the important thing is that's a much better improvement than I proposed. Patch v2 coming.

Previous: Junio C HamanoNext: Tao Klerks via GitGitGadget
Message 3 of 4 in “rev-parse: documentation adjustment - mention remote tracking with @{u}”
  1. rev-parse: documentation adjustment - mention remote tracking with @{u}Tao Klerks via GitGitGadget, Jun 20, 2022
  2. Junio C HamanoJun 21, 2022
  3. Tao KlerksJun 23, 2022
  4. rev-parse: documentation adjustment - mention remote tracking with @{u}Tao Klerks via GitGitGadget, Jun 23, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.