From: Thomas Ackermann Date: Mon, 15 Apr 2013 17:46:56 GMT Subject: [PATCH v3 1/4] glossary: remove outdated/misleading/irrelevant entries Message-ID: <1456791522.996464.1366048016249.JavaMail.ngmail@webmail19.arcor-online.net> In-Reply-To: <46832203.996447.1366047902197.JavaMail.ngmail@webmail19.arcor-online.net> Signed-off-by: Thomas Ackermann --- Documentation/glossary-content.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index eb7ba84..5a7a486 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -104,9 +104,6 @@ to point at the new commit. an arbitrary <> that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached". -[[def_dircache]]dircache:: - You are *waaaaay* behind. See <>. - [[def_directory]]directory:: The list you get with "ls" :-) @@ -115,11 +112,6 @@ to point at the new commit. it contains modifications which have not been <> to the current <>. -[[def_ent]]ent:: - Favorite synonym to "<>" by some total geeks. See - 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:: An evil merge is a <> that introduces changes that do not appear in any <>. @@ -257,8 +249,7 @@ This commit is referred to as a "merge commit", or sometimes just a <>. [[def_octopus]]octopus:: - To <> more than two <>. Also denotes an - intelligent predator. + To <> more than two <>. [[def_origin]]origin:: The default upstream <>. Most projects have -- 1.8.1.msysgit.1 --- Thomas