From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Date: Fri, 25 May 2007 21:05:19 -0400 [thread overview]
Message-ID: <20070526010519.GV28023@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0705260151320.4648@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> 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.
next prev parent reply other threads:[~2007-05-26 1:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-25 22:37 [PATCH 1/3] Documentation: Clean up links in GIT Glossary Jakub Narebski
2007-05-25 22:37 ` [PATCH 2/3] Documentation: Add definition of "evil merge" to " Jakub Narebski
2007-05-25 22:37 ` [PATCH 3/3] Replace the last 'dircache's by 'index' Jakub Narebski
2007-05-26 0:14 ` [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary J. Bruce Fields
2007-05-26 0:34 ` Jakub Narebski
2007-05-26 0:52 ` Johannes Schindelin
2007-05-26 1:05 ` Shawn O. Pearce [this message]
2007-05-25 23:50 ` [PATCH 1/3] Documentation: Clean up links in " J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070526010519.GV28023@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.