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

Re: [Bug] branch.*.merge interpreted too strictly by tracking logic

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 5, 2014, 21:10 UTC
Message-ID
<xmqq38jx2rl9.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20140205210831.GB16753@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> .... Did your report come
> out of a real case, or was it just something you noticed?

Some git-wrappers (like "repo") are reported to muck with the configuration files.

Previous: Jeff KingNext: Junio C Hamano
Message 5 of 6 in “[Bug] branch.*.merge interpreted too strictly by tracking logic”
  1. Junio C HamanoFeb 4, 2014
  2. Jeff KingFeb 5, 2014
  3. Junio C HamanoFeb 5, 2014
  4. Jeff KingFeb 5, 2014
  5. Junio C HamanoFeb 5, 2014
  6. checkout: report upstream correctly even with loosely defined branch.*.mergeJunio C Hamano, Oct 14, 2014

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.