On Tue, Jun 21, 2022 at 6:19 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> "Tao Klerks via GitGitGadget" <gitgitgadget@xxxxxxxxx> 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.
