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

Re: [PATCH] Adding rebase merge strategy

From
TCTom Clarke <tom@u2i.com>
Date
Sep 28, 2007, 17:18 UTC
Message-ID
<550f9510709281018h4197d942k9dcbcfbb657d1329@mail.gmail.com>
In-Reply-To
<Pine.LNX.4.64.0709281751390.28395@racer.site>
On 9/28/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > +# Copyright (c) 2005 Linus Torvalds
>
> Really?

Well 90% of the file was copy and pasted from one of the other merge strategies which was indeed written by Linus. So it seemed appropriate. If that's not appropriate attribution I can remove :-).

-Tom
Previous: Johannes SchindelinNext: Tom Clarke
Message 3 of 19 in “Adding rebase merge strategy”
  1. Adding rebase merge strategyTom Clarke, Sep 28, 2007
  2. Johannes SchindelinSep 28, 2007
  3. Tom ClarkeSep 28, 2007
  4. Adding rebase merge strategyTom Clarke, Oct 1, 2007
  5. Johannes SchindelinOct 1, 2007
  6. Junio C HamanoOct 1, 2007
  7. Tom ClarkeOct 1, 2007
  8. Carl WorthOct 1, 2007
  9. Tom ClarkeOct 1, 2007
  10. Shawn O. PearceOct 1, 2007
  11. Carl WorthOct 1, 2007
  12. Junio C HamanoOct 1, 2007
  13. Johannes SchindelinOct 2, 2007
  14. Tom ClarkeOct 2, 2007
  15. Junio C HamanoOct 2, 2007
  16. Tom ClarkeOct 3, 2007
  17. Johannes SchindelinOct 3, 2007
  18. J. Bruce FieldsOct 1, 2007
  19. Junio C HamanoOct 1, 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.