Hi Junio,
On 19/10/2019 00:11, Junio C Hamano wrote:
Philip Oakley writes:
branch..merge::
Defines, for the local branch , the upstream branch ref
_on the remote_ (as given by branch..remote).
The upstream ref may be different from the local branch ref.
optionally s/different f
Philip Oakley writes:
> branch..merge::
> Defines, for the local branch , the upstream branch ref
> _on the remote_ (as given by branch..remote).
> The upstream ref may be different from the local branch ref.
>
> optionally s/different from/ same as/ ?
That "optionally" part is exact
Hi Junio,
On 18/10/2019 02:32, Junio C Hamano wrote:
Philip Oakley writes:
branch..merge::
Defines, together with branch..remote, the upstream branch
- for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which
+ for the given branch. It defines the branch
Philip Oakley writes:
> branch..merge::
> Defines, together with branch..remote, the upstream branch
> - for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which
> + for the given branch. It defines the branch name _on the remote_,
> + which may be different fro
The branch..merge value typically looks just like a
local ref. Tell the reader it is the ref name at the remote,
which may be different.
Signed-off-by: Philip Oakley
---
This confusion had me scratching my head for many minutes recently.
A simple clarification would avoid such mental model error
5 matches
Mail list logo
