From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 25 May 2007 22:37:39 GMT
Subject: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Message-ID: <1180132662719-git-send-email-jnareb@gmail.com>
In-Reply-To: <11801326601014-git-send-email-jnareb@gmail.com>

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Applies cleanly to 'master' branch 18bece43675ea0dc9022a7868865e02808b7af7f

 Documentation/glossary.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index ba52618..e903abf 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -121,6 +121,10 @@ to point at the new commit.
 	`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
 	explanation. Avoid this term, not to confuse people.
 
+[[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>>.
+
 [[def_fast_forward]]fast forward::
 	A fast-forward is a special type of <<def_merge,merge>> where you have a
 	<<def_revision,revision>> and you are "merging" another
-- 
1.5.2