git/list[1] front-page[2] threads[3] people[4] search[5] about
 

branch.<branch>.merge and --format='%(upstream)'

From
SBSanti Béjar <santi@agolina.net>
Date
Jun 16, 2009, 11:08 UTC
Message-ID
<adf1fd3d0906160408s668f7a3fj5725cc4e98b317fc@mail.gmail.com>
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: Jeff King
Message 1 of 5 in “branch.<branch>.merge and --format='%(upstream)'”
  1. Santi BéjarJun 16, 2009
  2. Jeff KingJun 16, 2009
  3. Santi BéjarJun 16, 2009
  4. Junio C HamanoJun 16, 2009
  5. Santi BéjarJun 16, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.