From: Josh Ralburton <josh.ralburton@gmail.com>
To: git@vger.kernel.org
Subject: Question about "branch.<name>.merge"
Date: Fri, 18 Mar 2011 12:35:15 -0700 [thread overview]
Message-ID: <AANLkTin-96TK_8MjAM7MB4CCyZ0ZSvD=ZanaYWLiXsvC@mail.gmail.com> (raw)
This is a typical section from a .git config file:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://git.kernel.org/pub/scm/git/git.git
[branch "master"]
remote = origin
merge = refs/heads/master
I am curious why "branch.master.merge=refs/heads/master" was
implemented to refer to the remote branch (refs/heads/master) rather
than the local branch (refs/remotes/origin/master).
Thanks.
Josh
next reply other threads:[~2011-03-18 19:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-18 19:35 Josh Ralburton [this message]
2011-03-18 21:13 ` Question about "branch.<name>.merge" Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTin-96TK_8MjAM7MB4CCyZ0ZSvD=ZanaYWLiXsvC@mail.gmail.com' \
--to=josh.ralburton@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).