From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Date: Sat, 26 May 2007 00:37:39 +0200 [thread overview]
Message-ID: <1180132662719-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <11801326601014-git-send-email-jnareb@gmail.com>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Applies cleanly to 'master' branch 18bece43675ea0dc9022a7868865e02808b7af7f
Documentation/glossary.txt | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index ba52618..e903abf 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -121,6 +121,10 @@ to point at the new commit.
`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
explanation. Avoid this term, not to confuse people.
+[[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>>.
+
[[def_fast_forward]]fast forward::
A fast-forward is a special type of <<def_merge,merge>> where you have a
<<def_revision,revision>> and you are "merging" another
--
1.5.2
next prev parent reply other threads:[~2007-05-25 22:32 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 ` Jakub Narebski [this message]
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
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=1180132662719-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).