@matheusbsbs / matheus-bagliano / commits / c1bab2889e
Fork 0

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>

Jakub Narebski committed May 26, 2007 at 00:37 UTC c1bab2889eb71bf537497fc77a2fdb6a74bc92e6
1 file changed +4
Documentation/glossary.txt
+4
@@ -121,6 +121,10 @@ to point at the new commit.
121 `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
122 explanation. Avoid this term, not to confuse people.
123
124 +[[def_evil_merge]]evil merge::
125 + An evil merge is a <<def_merge,merge>> that introduces changes that
126 + do not appear in any <<def_parent,parent>>.
127 +
128 [[def_fast_forward]]fast forward::
129 A fast-forward is a special type of <<def_merge,merge>> where you have a
130 <<def_revision,revision>> and you are "merging" another