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

Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary

From
Shawn O. Pearce <spearce@spearce.org>
Date
May 26, 2007, 01:05 UTC
Message-ID
<20070526010519.GV28023@spearce.org>
In-Reply-To
<Pine.LNX.4.64.0705260151320.4648@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 8 quoted lines
> 
> On Sat, 26 May 2007, Jakub Narebski wrote:
> 
> > +[[def_evil_merge]]evil merge::
> > +	An evil merge is a <<def_merge,merge>> that introduces changes that
> > +	do not appear in any <<def_parent,parent>>.
> 
> Funny. For me, an evil merge is an octopus.

Funny, for me an evil merge is 30 commits in a straight row, all branch merges, when an octopus would be easier to read in gitk, and easier to execute... ;-)

Actually, my definition of evil merge matches Jakub's definition.
-- 
Shawn.
Previous: Johannes SchindelinNext: J. Bruce Fields
Message 7 of 8 in “Documentation: Clean up links in GIT Glossary”
  1. 1/3 Documentation: Clean up links in GIT GlossaryJakub Narebski, May 25, 2007
  2. 2/3 Documentation: Add definition of "evil merge" to GIT GlossaryJakub Narebski, May 25, 2007
  3. 3/3 Replace the last 'dircache's by 'index'Jakub Narebski, May 25, 2007
  4. J. Bruce FieldsMay 26, 2007
  5. Jakub NarebskiMay 26, 2007
  6. Johannes SchindelinMay 26, 2007
  7. Shawn O. PearceMay 26, 2007
  8. J. Bruce FieldsMay 25, 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.