summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2007-05-25 22:37:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-26 03:54:38 (GMT)
commitc1bab2889eb71bf537497fc77a2fdb6a74bc92e6 (patch)
tree88e164164b9917e2f0c3aae3f6c317ed1488b6c5 /Documentation/glossary.txt
parent5adf317b31729707fad4967c1aef6cdba43d0dd3 (diff)
downloadgit-c1bab2889eb71bf537497fc77a2fdb6a74bc92e6.zip
git-c1bab2889eb71bf537497fc77a2fdb6a74bc92e6.tar.gz
git-c1bab2889eb71bf537497fc77a2fdb6a74bc92e6.tar.bz2
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>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt4
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