summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 116ddb7fbf..14449ca8ba 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -86,7 +86,7 @@ directory::
ent::
Favorite synonym to "tree-ish" by some total geeks. See
`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
- explanation.
+ explanation. Avoid this term, not to confuse people.
fast forward::
A fast-forward is a special type of merge where you have