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

Re: small merge tool for temporary merges

From
Jakub Narebski <jnareb@gmail.com>
Date
Aug 10, 2008, 10:46 UTC
Message-ID
<m3ej4xtafq.fsf@localhost.localdomain>
In-Reply-To
<20080803163415.GB14513@gmx.de>
Marc Weber <marco-oweber@gmx.de> writes:
Show 7 quoted lines
> I'd like to announce the exisntance of my small git test merge tool.
> 
> After reading 
>  Linux kernel mailing list may remember that Linus complained about such
>  too frequent test merges when a subsystem maintainer asked to pull from
>  a branch full of "useless merges"
> in the man page of git-rerere I had to start it..

Could you add it to http://git.or.cz/gitwiki/InterfacesFrontendsAndTools when you feel it is ready (for example using '/bin/bash' or something like that in the she-bang (#!) line)? TIA.

-- 
Jakub Narebski
Poland
ShadeHawk on #git
Previous: Petr Baudis
Message 3 of 3 in “small merge tool for temporary merges”
  1. Marc WeberAug 3, 2008
  2. Petr BaudisAug 3, 2008
  3. Jakub NarebskiAug 10, 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.