From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 25 May 2007 22:37:39 +0000 (+0200)
Subject: Documentation: Add definition of "evil merge" to GIT Glossary
X-Git-Tag: v1.5.2.1~4^2~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1bab2889eb71bf537497fc77a2fdb6a74bc92e6;p=git.git

Documentation: Add definition of "evil merge" to GIT Glossary

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index ba5261883..e903abfeb 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