From: "J. Bruce Fields" <bfields@fieldses.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Date: Fri, 25 May 2007 20:14:23 -0400 [thread overview]
Message-ID: <20070526001423.GF32073@fieldses.org> (raw)
In-Reply-To: <1180132662719-git-send-email-jnareb@gmail.com>
On Sat, May 26, 2007 at 12:37:39AM +0200, 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>>.
> +
I'm a little skeptical. This term doesn't appear to be used anywhere in
the current documentation, for example--are you sure it's worth
including at this point? I don't know--I just don't want to end up with
an entry for every piece of cute jargon that's been used as shorthand on
the mailing list a few times. But if you think it's sufficiently useful
and well-established, then OK.
--b.
next prev parent reply other threads:[~2007-05-26 0:14 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 ` J. Bruce Fields [this message]
2007-05-26 0:34 ` [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary Jakub Narebski
2007-05-26 0:52 ` Johannes Schindelin
2007-05-26 1:05 ` Shawn O. Pearce
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=20070526001423.GF32073@fieldses.org \
--to=bfields@fieldses.org \
--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.