X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=ab4caf4e26c77e64679250e291279ee0f9c9c42a;hb=ce33288ea6b81a2f4f5aecd72177bcc8174562ae;hp=fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6;hpb=4a44b9ea51ef5183245c23473a33714a62ed224d;p=git.git diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt index fc1874424..ab4caf4e2 100644 --- a/Documentation/glossary.txt +++ b/Documentation/glossary.txt @@ -140,7 +140,7 @@ to point at the new commit. branch's <> from a remote <>, to find out which objects are missing from the local <>, - and to get them, too. See also gitlink:git-fetch[1]. + and to get them, too. See also linkgit:git-fetch[1]. [[def_file_system]]file system:: Linus Torvalds originally designed git to be a user space file system, @@ -164,7 +164,7 @@ to point at the new commit. A <> to the <> at the tip of a <>. Heads are stored in `$GIT_DIR/refs/heads/`, except when using packed refs. (See - gitlink:git-pack-refs[1].) + linkgit:git-pack-refs[1].) [[def_HEAD]]HEAD:: The current <>. In more detail: Your <>. The <> of the object's contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the <> of the object (possibly followed by - a white space). + the <> of the object. [[def_object_type]]object type:: One of the identifiers @@ -283,7 +282,7 @@ This commit is referred to as a "merge commit", or sometimes just a routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <> that introduced or removed, say, a - particular line of text. See gitlink:git-diff[1]. + particular line of text. See linkgit:git-diff[1]. [[def_plumbing]]plumbing:: Cute name for <>. @@ -296,7 +295,7 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_pull]]pull:: Pulling a <> means to <> it and - <> it. See also gitlink:git-pull[1]. + <> it. See also linkgit:git-pull[1]. [[def_push]]push:: Pushing a <> means to get the branch's @@ -334,7 +333,7 @@ This commit is referred to as a "merge commit", or sometimes just a A reflog shows the local "history" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, - yesterday 9:14pm. See gitlink:git-reflog[1] for details. + yesterday 9:14pm. See linkgit:git-reflog[1] for details. [[def_refspec]]refspec:: A "refspec" is used by <> and @@ -347,7 +346,7 @@ This commit is referred to as a "merge commit", or sometimes just a it as my origin branch head". And `git push $URL refs/heads/master:refs/heads/to-upstream` means "publish my master branch head as to-upstream branch at $URL". See also - gitlink:git-push[1]. + linkgit:git-push[1]. [[def_repository]]repository:: A collection of <> together with an @@ -384,15 +383,15 @@ This commit is referred to as a "merge commit", or sometimes just a 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 shallow repository - is created by giving the `--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 linkgit:git-clone[1], and + its history can be later deepened with linkgit:git-fetch[1]. [[def_symref]]symref:: Symbolic reference: instead of containing the <> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<>' is a prime example of a symref. Symbolic - references are manipulated with the gitlink:git-symbolic-ref[1] + references are manipulated with the linkgit:git-symbolic-ref[1] command. [[def_tag]]tag::