Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > 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. Funny, for me an evil merge is 30 commits in a straight row, all branch merges, when an octopus would be easier to read in gitk, and easier to execute... ;-) Actually, my definition of evil merge matches Jakub's definition. -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
