From: Shawn O. Pearce <spearce@spearce.org>
Date: Sat, 26 May 2007 01:05:19 GMT
Subject: Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Message-ID: <20070526010519.GV28023@spearce.org>
In-Reply-To: <Pine.LNX.4.64.0705260151320.4648@racer.site>

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 
> 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.