diff options
| author |  Matthias Lederhofer <matled@gmx.net> | 2006-07-09 11:59:39 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-07-09 03:26:49 -0700 |
| commit | cfc01c038709e4cdbf506d29937cac2bc1b76d39 (patch) | |
| tree | 6e53efa0ec3a57eb99ca111fd41535c4266ec50f /Documentation/glossary.txt | |
| parent | Assorted typo fixes (diff) | |
| download | tgif-cfc01c038709e4cdbf506d29937cac2bc1b76d39.tar.xz | |
change ent to tree in git-diff documentation
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/glossary.txt')
| -rw-r--r-- | Documentation/glossary.txt | 2 |
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 |