From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: GitList <git@vger.kernel.org>
Subject: Re: [PATCH v1] config/branch: state that <name>.merge is the remote ref
Date: Fri, 18 Oct 2019 10:32:20 +0900 [thread overview]
Message-ID: <xmqqwod26dp7.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191016112822.1701-1-philipoakley@iee.email> (Philip Oakley's message of "Wed, 16 Oct 2019 12:28:22 +0100")
Philip Oakley <philipoakley@iee.email> writes:
> branch.<name>.merge::
> Defines, together with branch.<name>.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 from the local branch name.
While I do agree with the goal of make things more clear, I'd avoid
being overly redundant and giving irrelevant information (e.g. the
copy you have locally may be made under arbitrary name that is
different from the name used at the remote). After all, the users
do not even need to know about the remote-tracking branch to
understand this naming mechanism.
Perhaps something along this line instead:
The name of the branch at the remote `branch.<name>.remote` that
is used as the upstream branch for the given branch. It tells
`git fetch`, etc., which branch to merge and ...
next prev parent reply other threads:[~2019-10-18 1:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 11:28 [PATCH v1] config/branch: state that <name>.merge is the remote ref Philip Oakley
2019-10-18 1:32 ` Junio C Hamano [this message]
2019-10-18 20:53 ` Philip Oakley
2019-10-18 20:59 ` [PATCH v2] " Philip Oakley
2019-10-18 23:11 ` [PATCH v1] " Junio C Hamano
2019-10-19 15:19 ` Philip Oakley
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
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=xmqqwod26dp7.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.email \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).