From: "Santi Béjar" <santi@agolina.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: branch.<branch>.merge and --format='%(upstream)'
Date: Tue, 16 Jun 2009 13:08:02 +0200 [thread overview]
Message-ID: <adf1fd3d0906160408s668f7a3fj5725cc4e98b317fc@mail.gmail.com> (raw)
Hi,
I've noticed that having branch.<branch>.merge set with the branch
name, and not with the full ref, cause problems with
--format='%(upstream)' and also with the "branch -av" and "git
status" upstream branch outputs. But git-fetch and git-pull works ok,
so it is a valid setting.
$ git clone git.git
$ cd git
$ git config branch.master.merge
refs/heads/master
$ git for-each-ref --format='%(upstream)' refs/heads/master
refs/remotes/origin/master
$ git config branch.master.merge master
$ git config branch.master.merge
master
$ git for-each-ref --format='%(upstream)' refs/heads/master
$
Best regards,
Santi
next reply other threads:[~2009-06-16 11:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 11:08 Santi Béjar [this message]
2009-06-16 12:23 ` branch.<branch>.merge and --format='%(upstream)' Jeff King
2009-06-16 14:07 ` Santi Béjar
2009-06-16 15:46 ` Junio C Hamano
2009-06-16 22:34 ` Santi Béjar
-- strict thread matches above, loose matches on Subject: below --
2009-06-18 7:57 [RFC/PATCH 0/2] Support for arbitrary mapping for "git pull --rebase" Santi Béjar
2009-06-18 7:57 ` branch.<branch>.merge and --format='%(upstream)' Santi Béjar
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=adf1fd3d0906160408s668f7a3fj5725cc4e98b317fc@mail.gmail.com \
--to=santi@agolina.net \
--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).