From 2de9b71138171dca7279db3b3fe67e868c76d921 Mon Sep 17 00:00:00 2001 From: Thomas Ackermann Date: Mon, 21 Jan 2013 20:17:53 +0100 Subject: Documentation: the name of the system is 'Git', not 'git' Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano --- Documentation/glossary-content.txt | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'Documentation/glossary-content.txt') diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 7c28aef5de..7c15bc0f53 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -7,7 +7,7 @@ A bare repository is normally an appropriately named <> with a `.git` suffix that does not have a locally checked-out copy of any of the files under - revision control. That is, all of the `git` + revision 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 `repository.git` directory instead, @@ -22,7 +22,7 @@ <> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <>, which moves forward as additional development - is done on the branch. A single git + is done on the branch. A single Git <> can track an arbitrary number of branches, but your <> is associated with just one of them (the "current" or "checked out" @@ -37,9 +37,9 @@ <> could be one of its <>). [[def_changeset]]changeset:: - BitKeeper/cvsps speak for "<>". Since git does not + BitKeeper/cvsps speak for "<>". Since Git does not store changes, but states, it really does not make sense to use the term - "changesets" with git. + "changesets" with Git. [[def_checkout]]checkout:: The action of updating all or part of the @@ -64,14 +64,14 @@ [[def_commit]]commit:: As a noun: A single point in the - git history; the entire history of a project is represented as a + Git history; the entire history of a project is represented as a set of interrelated commits. The word "commit" is often - used by git in the same places other revision control systems + used by Git in the same places other revision control systems use the words "revision" or "version". Also used as a short hand for <>. + As a verb: The action of storing a new snapshot of the project's -state in the git history, by creating a new commit representing the current +state in the Git history, by creating a new commit representing the current state of the <> and advancing <> to point at the new commit. @@ -82,8 +82,8 @@ to point at the new commit. to the top <> of the stored revision. -[[def_core_git]]core git:: - Fundamental data structures and utilities of git. Exposes only limited +[[def_core_git]]core Git:: + Fundamental data structures and utilities of Git. Exposes only limited source code management tools. [[def_DAG]]DAG:: @@ -100,7 +100,7 @@ to point at the new commit. [[def_detached_HEAD]]detached HEAD:: Normally the <> stores the name of a - <>. However, git also allows you to <> + <>. However, Git also allows you to <> an arbitrary <> that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached". @@ -142,22 +142,22 @@ to point at the new commit. 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, + Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the - efficiency and speed of git. + efficiency and speed of Git. -[[def_git_archive]]git archive:: +[[def_git_archive]]Git archive:: Synonym for <> (for arch people). [[def_grafts]]grafts:: Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way - you can make git pretend the set of <> a <> has + you can make Git pretend the set of <> a <> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file. [[def_hash]]hash:: - In git's context, synonym to <>. + In Git's context, synonym to <>. [[def_head]]head:: A <> to the <> at the tip of a @@ -177,14 +177,14 @@ to point at the new commit. A synonym for <>. [[def_hook]]hook:: - During the normal execution of several git commands, call-outs are made + During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions - of git you had to make them executable. + of Git you had to make them executable. [[def_index]]index:: A collection of files with stat information, whose contents are stored @@ -201,7 +201,7 @@ to point at the new commit. [[def_master]]master:: The default development <>. Whenever you - create a git <>, a branch named + create a Git <>, a branch named "master" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required. @@ -228,7 +228,7 @@ This commit is referred to as a "merge commit", or sometimes just a "merge". [[def_object]]object:: - The unit of storage in git. It is uniquely identified by the + The unit of storage in Git. It is uniquely identified by the <> of its contents. Consequently, an object can not be changed. @@ -323,7 +323,7 @@ top `/`;; + Currently only the slash `/` is recognized as the "magic signature", but it is envisioned that we will support more types of magic in later -versions of git. +versions of Git. + A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec. @@ -341,12 +341,12 @@ should not be combined with other pathspec. particular line of text. See linkgit:git-diff[1]. [[def_plumbing]]plumbing:: - Cute name for <>. + Cute name for <>. [[def_porcelain]]porcelain:: Cute name for programs and program suites depending on - <>, presenting a high level access to - core git. Porcelains expose more of a <> + <>, presenting a high level access to + core Git. Porcelains expose more of a <> interface than the <>. [[def_pull]]pull:: @@ -406,7 +406,7 @@ should not be combined with other pathspec. linkgit:git-push[1]. [[def_remote_tracking_branch]]remote-tracking branch:: - A regular git <> that is used to follow changes from + A regular Git <> that is used to follow changes from another <>. A remote-tracking branch should not contain direct modifications or have local commits made to it. A remote-tracking branch can usually be @@ -443,7 +443,7 @@ should not be combined with other pathspec. [[def_shallow_repository]]shallow repository:: A shallow <> has an incomplete history some of whose <> have <> cauterized away (in other - words, git is told to pretend that these commits do not have the + words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the @@ -464,9 +464,9 @@ should not be combined with other pathspec. object of an arbitrary type (typically a tag points to either a <> or a <>). In contrast to a <>, a tag is not updated by - the `commit` command. A git tag has nothing to do with a Lisp + the `commit` command. 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 + in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <>. [[def_tag_object]]tag object:: @@ -476,7 +476,7 @@ should not be combined with other pathspec. signature, in which case it is called a "signed tag object". [[def_topic_branch]]topic branch:: - A regular git <> that is used by a developer to + A regular Git <> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet -- cgit 1.2.3-korg