Documentation: Add definition of "evil merge" to GIT Glossary
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: c1bab2889eb71bf537497fc77a2fdb6a74bc92e6)
-rw-r--r-- 4009 pack-format.txt
-rw-r--r-- 18237 pack-heuristics.txt
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 8669 racy-git.txt
-rw-r--r-- 1949 send-pack-pipeline.txt
-rw-r--r-- 2062 shallow.txt
-rw-r--r-- 4246 trivial-merge.txt