mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glossary: remove outdated/misleading/irrelevant entries

Browse Source 
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Ackermann
2013-04-15 19:46:56 +02:00
committed by Junio C Hamano
parent a46221e9ad
commit 79de45588c
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/glossary-content.txt
View File

@ -104,9 +104,6 @@ to point at the new commit.
an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any
particular branch. In this case HEAD is said to be "detached". particular branch. In this case HEAD is said to be "detached".
[[def_dircache]]dircache::
You are *waaaaay* behind. See <<def_index,index>>.
[[def_directory]]directory:: [[def_directory]]directory::
The list you get with "ls" :-) The list you get with "ls" :-)
@ -115,11 +112,6 @@ to point at the new commit.
it contains modifications which have not been <<def_commit,committed>> to the current it contains modifications which have not been <<def_commit,committed>> to the current
<<def_branch,branch>>. <<def_branch,branch>>.
[[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
explanation. Avoid this term, not to confuse people.
[[def_evil_merge]]evil merge:: [[def_evil_merge]]evil merge::
An evil merge is a <<def_merge,merge>> that introduces changes that An evil merge is a <<def_merge,merge>> that introduces changes that
do not appear in any <<def_parent,parent>>. 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
<<def_object,object>>. <<def_object,object>>.
[[def_octopus]]octopus:: [[def_octopus]]octopus::
To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an To <<def_merge,merge>> more than two <<def_branch,branches>>.
intelligent predator.
[[def_origin]]origin:: [[def_origin]]origin::
The default upstream <<def_repository,repository>>. Most projects have The default upstream <<def_repository,repository>>. Most projects have