X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=14449ca8baeb7c2c979d0fd3f61ce683fd8e08ce;hb=4f12d529abbf233e1df93e7ffa5f2719005a2258;hp=116ddb7fbfd7654bb7330e8f56dd03a9be029cd1;hpb=75c3a5ccdf114b5485e4828db1923bf4a35b19e2;p=git.git diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 116ddb7fb..14449ca8b 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