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

Re: [PATCH] Add git-mergetool to run an appropriate merge conflict resolution program

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Mar 6, 2007, 22:55 UTC
Message-ID
<Pine.LNX.4.64.0703061454350.5963@woody.linux-foundation.org>
In-Reply-To
<20070306124002.GA18370@thunk.org>
On Tue, 6 Mar 2007, Theodore Tso wrote:
Show 6 quoted lines
> 
> I assume you would prefer that it read Junio instead?  Should we
> change the COPYING while we're at it, perhaps after consulting with
> Linus since he still owns so a fair amount of the copyright on git?
> It seems that if we're going to pre-collect permissions to move to
> GPLv3, it ought to be either you or him....

I'm ok with Junio controlling it as far as I'm concerned. After all, he's been the maintainer for the last two years, so he gets the blame, and he'd better get the credit too.

			Linus
Previous: Theodore TsoNext: Junio C Hamano
Message 4 of 7 in “Add git-mergetool to run an appropriate merge conflict resolution program”
  1. Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o, Mar 6, 2007
  2. Junio C HamanoMar 6, 2007
  3. Theodore TsoMar 6, 2007
  4. Linus TorvaldsMar 6, 2007
  5. Junio C HamanoMar 6, 2007
  6. Junio C HamanoMar 29, 2007
  7. Theodore TsoMar 29, 2007

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.