diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
| commit | 44dcd493a7896aabe2b48b0a2935633538d81f7c (patch) | |
| tree | 55fb9bfad3faa4309b5e1c0781f78d635c6dbd3b /glossary-content.txt | |
| parent | bb300643ea913f58d836780e949b1ebcce8da530 (diff) | |
| download | git-htmldocs-44dcd493a7896aabe2b48b0a2935633538d81f7c.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0
Diffstat (limited to 'glossary-content.txt')
| -rw-r--r-- | glossary-content.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index 3595b586b..f928b57f9 100644 --- a/glossary-content.txt +++ b/glossary-content.txt @@ -117,7 +117,7 @@ to point at the new commit. [[def_ent]]ent:: Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See - `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. [[def_evil_merge]]evil merge:: |