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

Re: What's cooking in git.git (May 2011, #03; Fri, 6)

From
Jeff King <peff@peff.net>
Date
May 7, 2011, 01:46 UTC
Message-ID
<20110507014634.GB25771@sigill.intra.peff.net>
In-Reply-To
<7v7ha3xvm1.fsf@alter.siamese.dyndns.org>
On Fri, May 06, 2011 at 04:22:30PM -0700, Junio C Hamano wrote:
> * jk/merge-one-file-working-tree (2011-04-29) 2 commits
>   (merged to 'next' on 2011-05-02 at 308fe21)
>  + merge-one-file: fix broken merges with alternate work trees
>  + add tests for merge-index / merge-one-file

Hmm, I expected this to end up on maint. Is it worth cherry-picking (it cleanly applies to maint)?

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 3 in “What's cooking in git.git (May 2011, #03; Fri, 6)”
  1. Junio C HamanoMay 6, 2011
  2. Jeff KingMay 7, 2011
  3. Junio C HamanoMay 7, 2011

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.