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

Re: [GSoC] Git projects for Google Summer of Code 2008 final evaluation

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Sep 4, 2008, 22:55 UTC
Message-ID
<20080904225559.GP16514@genesis.frugalware.org>
In-Reply-To
<200809042315.58898.jnareb@gmail.com>
On Thu, Sep 04, 2008 at 11:15:56PM +0200, Jakub Narebski <jnareb@gmail.com> wrote:
> 5. git-merge builtin
> 
> Student: Miklos Vajna
> Mentor: Johannes Schindelin

builtin-merge is merged. I did not have it in my proposal, but support for custom merge strategies is also merged. Lately I was working on a better merge-recursive API, that is mostly in next now.

Time did not permit, but I was about to rewrite merge-octopus, merge-one-file and merge-resolve in C as well.

I hope I'll have time to do it later in my free time, but I can't promise anything, being a fulltime student as well. ;-)

Previous: Sverre RabbelierNext: Shawn O. Pearce
Message 6 of 12 in “[GSoC] Git projects for Google Summer of Code 2008 final evaluation”
  1. Jakub NarebskiSep 4, 2008
  2. Daniel BarkalowSep 4, 2008
  3. Joshua RoysSep 4, 2008
  4. Stephan BeyerSep 4, 2008
  5. Sverre RabbelierSep 4, 2008
  6. Miklos VajnaSep 4, 2008
  7. Shawn O. PearceSep 4, 2008
  8. Marek ZawirskiSep 8, 2008
  9. Johannes SchindelinSep 9, 2008
  10. Jakub NarebskiSep 15, 2008
  11. Johannes SchindelinSep 15, 2008
  12. Shawn O. PearceSep 15, 2008

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.