[PATCH 1/3] Documentation: Clean up links in GIT Glossary · Jakub Narebski <hidden> · 2016-06-15
[PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary · Jakub Narebski <hidden> · 2016-06-15
[PATCH 3/3] Replace the last 'dircache's by 'index' · Jakub Narebski <hidden> · 2016-06-15
Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary · J. Bruce Fields <hidden> · 2016-06-15
Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary · Jakub Narebski <hidden> · 2016-06-15
Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary · Johannes Schindelin <hidden> · 2016-06-15
Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary · Shawn O. Pearce <hidden> · 2016-06-15
Re: [PATCH 1/3] Documentation: Clean up links in GIT Glossary · J. Bruce Fields <hidden> · 2016-06-15

Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:12

Hi,

On Sat, 26 May 2007, Jakub Narebski wrote:

+[[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>>.

Funny. For me, an evil merge is an octopus.

Ciao,
Dscho