glossary: remove outdated/misleading/irrelevant entries
Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Ackermann committed
Apr 15, 2013 at 19:46 UTC
79de45588c2d90591a2bc0fcf28964bce642fd71
1 file changed
+1
-10
Documentation/glossary-content.txt
+1
-10
@@ -104,9 +104,6 @@ to point at the new commit.
104
an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any
105
particular branch. In this case HEAD is said to be "detached".
106
107
-[[def_dircache]]dircache::
108
- You are *waaaaay* behind. See <<def_index,index>>.
109
-
107
[[def_directory]]directory::
108
The list you get with "ls" :-)
109
@@ -115,11 +112,6 @@ to point at the new commit.
112
it contains modifications which have not been <<def_commit,committed>> to the current
113
<<def_branch,branch>>.
114
118
-[[def_ent]]ent::
119
- Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
120
- http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
121
- explanation. Avoid this term, not to confuse people.
122
-
115
[[def_evil_merge]]evil merge::
116
An evil merge is a <<def_merge,merge>> that introduces changes that
117
do not appear in any <<def_parent,parent>>.
@@ -257,8 +249,7 @@ This commit is referred to as a "merge commit", or sometimes just a
249
<<def_object,object>>.
250
251
[[def_octopus]]octopus::
260
- To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an
261
- intelligent predator.
252
+ To <<def_merge,merge>> more than two <<def_branch,branches>>.
253
254
[[def_origin]]origin::
255
The default upstream <<def_repository,repository>>. Most projects have