From c1bab2889eb71bf537497fc77a2fdb6a74bc92e6 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Sat, 26 May 2007 00:37:39 +0200 Subject: [PATCH] Documentation: Add definition of "evil merge" to GIT Glossary Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano --- Documentation/glossary.txt | 4 ++++ 1 file changed, 4 insertions(+) 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 <> that introduces changes that + do not appear in any <>. + [[def_fast_forward]]fast forward:: A fast-forward is a special type of <> where you have a <> and you are "merging" another -- 2.30.2