From: Philip Oakley <philipoakley@iee.email>
To: GitList <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Cc: Philip Oakley <philipoakley@iee.email>
Subject: [PATCH v2] config/branch: state that <name>.merge is the remote ref
Date: Fri, 18 Oct 2019 21:59:35 +0100 [thread overview]
Message-ID: <20191018205935.2529-1-philipoakley@iee.email> (raw)
In-Reply-To: <c96f4dbd-ebc6-b743-716e-e1e17333c06b@iee.email>
The branch.<name>.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 <philipoakley@iee.email>
---
Documentation/config/branch.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index a592d522a7..cdc19edaaf 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -52,8 +52,10 @@ branch.<name>.pushRemote::
option to override it for a specific branch.
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
+ The name of the branch ref at the remote `branch.<name>.remote`
+ that is used as the upstream branch for the given branch <name>.
++
+ It tells 'git fetch'/'git pull'/'git rebase' which
branch to merge and can also affect 'git push' (see push.default).
When in branch <name>, it tells 'git fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
--
2.23.0.windows.1.21.g947f504ebe8.dirty
next prev parent reply other threads:[~2019-10-18 20:59 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
2019-10-18 20:53 ` Philip Oakley
2019-10-18 20:59 ` Philip Oakley [this message]
2019-10-18 23:11 ` 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=20191018205935.2529-1-philipoakley@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).