kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Documentation: Add definition of "evil merge" to GIT Glossary 

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Jakub Narebski 18 years ago committed by Junio C Hamano
parent
5adf317b31
commit
c1bab2889e
1 changed files with 4 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Documentation/glossary.txt

4
Documentation/glossary.txt
Unescape View File

@ -121,6 +121,10 @@ to point at the new commit.
`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
explanation. Avoid this term, not to confuse people. 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:: [[def_fast_forward]]fast forward::
A fast-forward is a special type of <<def_merge,merge>> where you have a A fast-forward is a special type of <<def_merge,merge>> where you have a
<<def_revision,revision>> and you are "merging" another <<def_revision,revision>> and you are "merging" another

Write Preview
Loading…
Cancel
Save