From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to
 GIT Glossary
Date: Sat, 26 May 2007 01:52:09 +0100 (BST)
Message-ID: <Pine.LNX.4.64.0705260151320.4648@racer.site>
References: <11801326601014-git-send-email-jnareb@gmail.com>
 <1180132662719-git-send-email-jnareb@gmail.com>
Mime-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: git@vger.kernel.org
To: Jakub Narebski <jnareb@gmail.com>
X-From: git-owner@vger.kernel.org Sat May 26 02:52:26 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1HrkW7-0002R0-SE
	for gcvg-git@gmane.org; Sat, 26 May 2007 02:52:24 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751075AbXEZAwQ (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Fri, 25 May 2007 20:52:16 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751938AbXEZAwQ
	(ORCPT <rfc822;git-outgoing>); Fri, 25 May 2007 20:52:16 -0400
Received: from mail.gmx.net ([213.165.64.20]:41523 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1751075AbXEZAwP (ORCPT <rfc822;git@vger.kernel.org>);
	Fri, 25 May 2007 20:52:15 -0400
Received: (qmail invoked by alias); 26 May 2007 00:52:13 -0000
Received: from wbgn013.biozentrum.uni-wuerzburg.de (EHLO localhost) [132.187.25.13]
  by mail.gmx.net (mp050) with SMTP; 26 May 2007 02:52:13 +0200
X-Authenticated: #1490710
X-Provags-ID: V01U2FsdGVkX1+o1DROgM2o+ALTpoSeXs7fZK04cYNxpQiuI+34ti
	PJ709crUM+XrJ7
X-X-Sender: gene099@racer.site
In-Reply-To: <1180132662719-git-send-email-jnareb@gmail.com>
X-Y-GMX-Trusted: 0
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/48438>

Hi,

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.

Ciao,
Dscho