From cbd919221f598811e0eb2587d361581f7552e2e7 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 18 Mar 2007 17:53:29 -0400 Subject: [PATCH] glossary: clean up cross-references Manual clean-up of cross-references, and also clean up a few definitions (e.g. git-rebase). Signed-off-by: "J. Bruce Fields" --- Documentation/glossary.txt | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index 82e17db0c..2465514e4 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -13,7 +13,7 @@ GIT Glossary <> control. That is, all of the `git` administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the - `<>.git` <> instead, + `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available. @@ -23,7 +23,7 @@ GIT Glossary [[def_branch]]branch:: A non-cyclical graph of revisions, i.e. the complete history of a particular <>, which is called the - <> <>. The <> heads + branch <>. The heads are stored in `$GIT_DIR/refs/heads/`. [[def_cache]]cache:: @@ -133,7 +133,7 @@ GIT Glossary together by recording fake ancestry information for commits. This way you can make git pretend the set of parents a <> has is different from what was recorded when the <> was - created. Configured via the `.git/info/<>` file. + created. Configured via the `.git/info/grafts` file. [[def_hash]]hash:: In git's context, synonym to <>. @@ -205,7 +205,7 @@ GIT Glossary [[def_object_type]]object type:: One of the identifiers - "<>","<>","<>" and "blob" + "<>","<>","<>" or "<>" describing the type of an <>. [[def_octopus]]octopus:: @@ -217,7 +217,7 @@ GIT Glossary at least one upstream project which they track. By default '<>' is used for that purpose. New upstream updates will be fetched into remote tracking branches named - <>/name-of-upstream-branch, which you can see using + origin/name-of-upstream-branch, which you can see using "git <> -r". [[def_pack]]pack:: @@ -271,14 +271,15 @@ GIT Glossary <> from that <>. More generally, one <> is <> from another if we can reach the one from the other by a <> - that follows tags to whatever they <>, commits to their - parents or trees, and trees to the trees or blobs that they contain. + that follows <> to whatever they tag, + <> to their parents or trees, and + <> to the trees or <> + that they contain. [[def_rebase]]rebase:: - To <> a <> by starting from the - <> of the main line of development - ("<>"), and reapply the (possibly cherry-picked) - changes from that <>. + To reapply a series of changes from a <> to a + different base, and reset the <> of that branch + to the result. [[def_ref]]ref:: A 40-byte hex representation of a <> or a name that @@ -290,19 +291,18 @@ GIT Glossary <> to describe the mapping between remote <> and local <>. They are combined with a colon in the format :, preceded by an optional plus sign, +. For example: `git - <> $URL - refs/heads/<>:refs/heads/<>` means - "grab the <> <> <> - from the $URL and store it as my <> + fetch $URL refs/heads/master:refs/heads/origin` means + "grab the master <> <> + from the $URL and store it as my origin <> <>". And `git <> - $URL refs/heads/<>:refs/heads/to-upstream` means - "publish my <> <> + $URL refs/heads/master:refs/heads/to-upstream` means + "publish my master <> <> as to-upstream <> at $URL". See also gitlink:git-push[1] [[def_repository]]repository:: A collection of refs together with an <> containing all objects, which are <> + database>> containing all objects which are <> from the refs, possibly accompanied by meta data from one or more porcelains. A <> can share an <> with other repositories. @@ -334,12 +334,12 @@ GIT Glossary object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A <> - is created by giving `--depth` option to gitlink:git-clone[1], and its - history can be later deepened with gitlink:git-fetch[1]. + is created by giving the `--depth` option to gitlink:git-clone[1], and + its history can be later deepened with gitlink:git-fetch[1]. [[def_symref]]symref:: Symbolic reference: instead of containing the <> id - itself, it is of the format '<>: refs/some/thing' and when + itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. 'HEAD' is a prime example of a <>. Symbolic references are manipulated with the gitlink:git-symbolic-ref[1] command. @@ -347,11 +347,11 @@ GIT Glossary [[def_tag]]tag:: A <> pointing to a <> or <>. In contrast to a <>, - a <> is not changed by a <>. Tags (not - <> objects) are stored in `$GIT_DIR/refs/tags/`. A git - <> has nothing to do with a Lisp <> (which is - called <> in git's context). A - <> is most typically used to mark a particular point in the + a tag is not changed by a <>. Tags (not + <>) are stored in `$GIT_DIR/refs/tags/`. A + git tag has nothing to do with a Lisp tag (which would be + called an <> in git's context). A + tag is most typically used to mark a particular point in the <> ancestry <>. [[def_tag_object]]tag object:: @@ -383,7 +383,7 @@ GIT Glossary [[def_tree_object]]tree object:: An <> containing a list of file names and modes along - with refs to the associated blob and/or <> objects. A + with refs to the associated blob and/or tree objects. A <> is equivalent to a <>. [[def_tree-ish]]tree-ish:: @@ -393,8 +393,8 @@ GIT Glossary <>. [[def_unmerged_index]]unmerged index:: - An <> which contains <> entries. + An <> which contains unmerged + <>. [[def_unreachable_object]]unreachable object:: An <> which is not <> from a -- 2.30.2