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

Re: [GIT PULL] GPIO bulk changes for kernel v4.6

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 18, 2016, 17:16 UTC
Message-ID
<xmqqk2kzr9iw.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CA+55aFzVqPzEg6zq7sRweE7OCVKMJzM1eZRHXddMG+BabEDeCA@mail.gmail.com>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 7 quoted lines
> The code in the recursive merge that allows this to happen is this:
> ...
> And I do think that's right, and I think it's clever, and it goes back to 2006:
>
>   934d9a24078e merge-recur: if there is no common ancestor, fake empty one
>
> but I think there should be an option there.
Oh, I think everybody understands that and agrees by now.
Previous: Linus Torvalds
Message 7 of 7 in “Re: [GIT PULL] GPIO bulk changes for kernel v4.6”
  1. Linus TorvaldsMar 18, 2016
  2. Johannes SchindelinMar 18, 2016
  3. Junio C HamanoMar 18, 2016
  4. Linus TorvaldsMar 18, 2016
  5. Junio C HamanoMar 18, 2016
  6. Linus TorvaldsMar 18, 2016
  7. Junio C HamanoMar 18, 2016

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.