From: Junio C Hamano Date: Sun, 27 May 2007 04:29:12 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-86-g99b5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36460981d4d516642ddd8ee3afd442552a28a48a;p=git.git Autogenerated HTML docs for v1.5.2-86-g99b5 --- diff --git a/git-ls-files.html b/git-ls-files.html index c428a7abe..57acf378f 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -539,7 +539,7 @@ which case it outputs:

"git-ls-files --unmerged" and "git-ls-files --stage" can be used to examine detailed information on unmerged paths.

For an unmerged path, instead of recording a single mode/SHA1 pair, -the dircache records up to three such pairs; one from tree O in stage +the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git-read-tree for more information on state)

@@ -688,7 +688,7 @@ from getting ignored.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 076cebca1..43e0d2266 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -124,7 +124,7 @@ which case it outputs: detailed information on unmerged paths. For an unmerged path, instead of recording a single mode/SHA1 pair, -the dircache records up to three such pairs; one from tree O in stage +the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see git-read-tree for more information on state) diff --git a/glossary.html b/glossary.html index 6e92a3b26..970458b15 100644 --- a/glossary.html +++ b/glossary.html @@ -282,7 +282,7 @@ div.exampleblock-content { A bare repository is normally an appropriately named directory 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, @@ -329,7 +329,7 @@ div.exampleblock-content {

A list of objects, where each object in the list contains a reference to its successor (for example, the successor of a - commit could be one of its parents). + commit could be one of its parents).

@@ -398,10 +398,10 @@ to point at the new commit.

An object which contains the information about a - particular revision, such as parents, committer, + particular revision, such as parents, committer, author, date and the tree object which corresponds to the top directory of the stored - revision. + revision.

@@ -442,8 +442,8 @@ to point at the new commit.

Normally the HEAD stores the name of a - branch. However, git also allows you to check - out an arbitrary commit that isn't necessarily the tip of any + branch. However, git also allows you to check out + an arbitrary commit that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached".

@@ -452,7 +452,7 @@ to point at the new commit.

- You are waaaaay behind. + You are waaaaay behind. See index.

@@ -469,7 +469,7 @@ to point at the new commit.

A working tree is said to be "dirty" if - it contains modifications which have not been committed to the current + it contains modifications which have not been committed to the current branch.

@@ -484,6 +484,15 @@ to point at the new commit.

+evil merge +
+
+

+ An evil merge is a merge that introduces changes that + do not appear in any parent. +

+
+
fast forward
@@ -535,7 +544,7 @@ to point at the new commit.

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 parents a commit has + you can make git pretend the set of parents a commit has is different from what was recorded when the commit was created. Configured via the .git/info/grafts file.

@@ -553,7 +562,7 @@ to point at the new commit.

- A named reference to the commit at the tip of a + A named reference to the commit at the tip of a branch. Heads are stored in $GIT_DIR/refs/heads/, except when using packed refs. (See git-pack-refs(1).) @@ -564,7 +573,7 @@ to point at the new commit.

- The current branch. In more detail: Your working tree is normally derived from the state of the tree + The current branch. In more detail: Your working tree is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the heads in your repository, except when using a detached HEAD, in which case it may @@ -589,7 +598,7 @@ to point at the new commit.

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 + $GIT_DIR/hooks/ directory, and are enabled by simply making them executable.

@@ -599,10 +608,10 @@ to point at the new commit.

A collection of files with stat information, whose contents are stored - as objects. The index is a stored version of your working - tree. Truth be told, it can also contain a second, and even - a third version of a working tree, which are used - when merging. + as objects. The index is a stored version of your + working tree. Truth be told, it can also contain a second, and even + a third version of a working tree, which are used + when merging.

@@ -708,7 +717,7 @@ This commit is referred to as a "merge commit", or sometimes just a

- To merge more than two branches. Also denotes an + To merge more than two branches. Also denotes an intelligent predator.

@@ -720,9 +729,9 @@ This commit is referred to as a "merge commit", or sometimes just a The default upstream repository. Most projects have at least one upstream project which they track. By default origin is used for that purpose. New upstream updates - will be fetched into remote tracking branches named + will be fetched into remote tracking branches named origin/name-of-upstream-branch, which you can see using - "git branch -r". + "git branch -r".

@@ -851,7 +860,7 @@ This commit is referred to as a "merge commit", or sometimes just a

- A refspec is used by fetch and + A "refspec" is used by fetch and push to describe the mapping between remote ref and local ref. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. @@ -869,11 +878,12 @@ This commit is referred to as a "merge commit", or sometimes just a

- A collection of refs together with an + A collection of refs together with an object database containing all objects which are reachable from the refs, possibly - accompanied by meta data from one or more porcelains. A - repository can share an object database with other repositories. + accompanied by meta data from one or more porcelains. A + repository can share an object database with other repositories + via alternates mechanism.

@@ -925,8 +935,8 @@ This commit is referred to as a "merge commit", or sometimes just a

- A shallow repository has an incomplete - history some of whose commits have parents cauterized away (in other + A shallow repository has an incomplete + history some of whose commits have parents cauterized away (in other words, git is told to pretend that these commits do not have the parents, even though they are recorded in the commit 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 @@ -953,7 +963,7 @@ This commit is referred to as a "merge commit", or sometimes just a

- A ref pointing to a tag or + A ref pointing to a tag or commit object. In contrast to a head, a tag is not changed by a commit. Tags (not tag objects) are stored in $GIT_DIR/refs/tags/. A @@ -971,7 +981,7 @@ This commit is referred to as a "merge commit", or sometimes just a An object containing a ref pointing to another object, which can contain a message just like a commit object. It can also contain a (PGP) - signature, in which case it is called a "signed tag object". + signature, in which case it is called a "signed tag object".

@@ -1004,7 +1014,7 @@ This commit is referred to as a "merge commit", or sometimes just a

- Either a working tree, or a tree object together with the dependent blob and tree objects + Either a working tree, or a tree object together with the dependent blob and tree objects (i.e. a stored representation of a working tree).

@@ -1059,7 +1069,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/glossary.txt b/glossary.txt index 489c3e9d5..e903abfeb 100644 --- a/glossary.txt +++ b/glossary.txt @@ -10,7 +10,7 @@ GIT Glossary 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 - <> 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, @@ -37,7 +37,7 @@ GIT Glossary [[def_chain]]chain:: A list of objects, where each <> in the list contains a reference to its successor (for example, the successor of a - <> could be one of its parents). + <> could be one of its <>). [[def_changeset]]changeset:: BitKeeper/cvsps speak for "<>". Since git does not @@ -77,10 +77,10 @@ to point at the new commit. [[def_commit_object]]commit object:: An <> which contains the information about a - particular <>, such as parents, committer, + particular <>, such as <>, committer, author, date and the <> which corresponds to the top <> of the stored - <>. + revision. [[def_core_git]]core git:: Fundamental data structures and utilities of git. Exposes only limited @@ -101,19 +101,19 @@ to point at the new commit. [[def_detached_HEAD]]detached HEAD:: Normally the <> stores the name of a - <>. However, git also allows you to check - out an arbitrary commit that isn't necessarily the tip of any + <>. 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". [[def_dircache]]dircache:: - You are *waaaaay* behind. + You are *waaaaay* behind. See <>. [[def_directory]]directory:: The list you get with "ls" :-) [[def_dirty]]dirty:: A <> is said to be "dirty" if - it contains modifications which have not been committed to the current + it contains modifications which have not been <> to the current <>. [[def_ent]]ent:: @@ -121,6 +121,10 @@ to point at the new commit. `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 <>. + [[def_fast_forward]]fast forward:: A fast-forward is a special type of <> where you have a <> and you are "merging" another @@ -149,7 +153,7 @@ to point at the new commit. [[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 parents 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. @@ -157,13 +161,13 @@ to point at the new commit. In git's context, synonym to <>. [[def_head]]head:: - A named reference to the <> at the tip of a + 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].) [[def_HEAD]]HEAD:: - The current branch. In more detail: Your <>. In more detail: Your <> is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the <> in your repository, except when using a @@ -179,15 +183,15 @@ to point at the new commit. 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/` <>, and are enabled by simply + `$GIT_DIR/hooks/` directory, and are enabled by simply making them executable. [[def_index]]index:: A collection of files with stat information, whose contents are stored - as objects. The index is a stored version of your working - <>. Truth be told, it can also contain a second, and even - a third version of a <>, which are used - when merging. + as objects. The index is a stored version of your + <>. Truth be told, it can also contain a second, and even + a third version of a working tree, which are used + when <>. [[def_index_entry]]index entry:: The information regarding a particular file, stored in the @@ -249,16 +253,16 @@ This commit is referred to as a "merge commit", or sometimes just a describing the type of an <>. [[def_octopus]]octopus:: - To <> more than two branches. Also denotes an + To <> more than two <>. Also denotes an intelligent predator. [[def_origin]]origin:: The default upstream <>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates - will be fetched into remote tracking branches named + will be fetched into remote <> named origin/name-of-upstream-branch, which you can see using - "git <> -r". + "`git branch -r`". [[def_pack]]pack:: A set of objects which have been compressed into one file (to save space @@ -327,7 +331,7 @@ This commit is referred to as a "merge commit", or sometimes just a `$GIT_DIR/refs/`. [[def_refspec]]refspec:: - A <> is used by <> and + A "refspec" is used by <> and <> to describe the mapping between remote <> and local ref. They are combined with a colon in the format :, preceded by an optional plus sign, +. @@ -340,11 +344,12 @@ This commit is referred to as a "merge commit", or sometimes just a gitlink:git-push[1] [[def_repository]]repository:: - A collection of refs together with an + A collection of <> together with an <> containing all objects which are <> from the refs, possibly - accompanied by meta data from one or more porcelains. A - repository can share an object database with other repositories. + accompanied by meta data from one or more <>. A + repository can share an object database with other repositories + via <>. [[def_resolve]]resolve:: The action of fixing up manually what a failed automatic @@ -366,8 +371,8 @@ This commit is referred to as a "merge commit", or sometimes just a Synonym for <>. [[def_shallow_repository]]shallow repository:: - A shallow repository has an incomplete - history some of whose commits have parents cauterized away (in other + 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 parents, even though they are recorded in the <>). This is sometimes useful when you are interested only in the @@ -385,7 +390,7 @@ This commit is referred to as a "merge commit", or sometimes just a command. [[def_tag]]tag:: - A <> pointing to a tag or + A <> pointing to a <> or <>. In contrast to a <>, a tag is not changed by a <>. Tags (not <>) are stored in `$GIT_DIR/refs/tags/`. A @@ -398,8 +403,7 @@ This commit is referred to as a "merge commit", or sometimes just a An <> containing a <> pointing to another object, which can contain a message just like a <>. It can also contain a (PGP) - signature, in which case it is called a "signed <>". + 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 @@ -418,7 +422,7 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_tree]]tree:: Either a <>, or a <> together with the dependent blob and tree objects + object>> together with the dependent <> and tree objects (i.e. a stored representation of a working tree). [[def_tree_object]]tree object:: diff --git a/user-manual.html b/user-manual.html index 395465131..b29829f57 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1578,7 +1578,7 @@ itself!

directory 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, @@ -1609,7 +1609,7 @@ itself!

A list of objects, where each object in the list contains a reference to its successor (for example, the successor of a - commit could be one of its parents). + commit could be one of its parents).
changeset
@@ -1653,10 +1653,10 @@ to point at the new commit.

commit object
An object which contains the information about a - particular revision, such as parents, committer, + particular revision, such as parents, committer, author, date and the tree object which corresponds to the top directory of the stored - revision. + revision.
core git
@@ -1681,13 +1681,13 @@ to point at the new commit.

detached HEAD
Normally the HEAD stores the name of a - branch. However, git also allows you to check - out an arbitrary commit that isn't necessarily the tip of any + branch. However, git also allows you to check out + an arbitrary commit that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached".
dircache
- You are waaaaay behind. + You are waaaaay behind. See index.
directory
@@ -1696,7 +1696,7 @@ to point at the new commit.

dirty
A working tree is said to be "dirty" if - it contains modifications which have not been committed to the current + it contains modifications which have not been committed to the current branch.
ent @@ -1705,6 +1705,11 @@ to point at the new commit.

http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth explanation. Avoid this term, not to confuse people.
+evil merge +
+ An evil merge is a merge that introduces changes that + do not appear in any parent. +
fast forward
A fast-forward is a special type of merge where you have a @@ -1738,7 +1743,7 @@ to point at the new commit.

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 parents a commit has + you can make git pretend the set of parents a commit has is different from what was recorded when the commit was created. Configured via the .git/info/grafts file.
@@ -1748,14 +1753,14 @@ to point at the new commit.

head
- A named reference to the commit at the tip of a + A named reference to the commit at the tip of a branch. Heads are stored in $GIT_DIR/refs/heads/, except when using packed refs. (See git-pack-refs(1).)
HEAD
- The current branch. In more detail: Your working tree is normally derived from the state of the tree + The current branch. In more detail: Your working tree is normally derived from the state of the tree referred to by HEAD. HEAD is a reference to one of the heads in your repository, except when using a detached HEAD, in which case it may @@ -1772,16 +1777,16 @@ to point at the new commit.

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 + $GIT_DIR/hooks/ directory, and are enabled by simply making them executable.
index
A collection of files with stat information, whose contents are stored - as objects. The index is a stored version of your working - tree. Truth be told, it can also contain a second, and even - a third version of a working tree, which are used - when merging. + as objects. The index is a stored version of your + working tree. Truth be told, it can also contain a second, and even + a third version of a working tree, which are used + when merging.
index entry
@@ -1850,7 +1855,7 @@ This commit is referred to as a "merge commit", or sometimes just a
octopus
- To merge more than two branches. Also denotes an + To merge more than two branches. Also denotes an intelligent predator.
origin @@ -1858,9 +1863,9 @@ This commit is referred to as a "merge commit", or sometimes just a The default upstream repository. Most projects have at least one upstream project which they track. By default origin is used for that purpose. New upstream updates - will be fetched into remote tracking branches named + will be fetched into remote tracking branches named origin/name-of-upstream-branch, which you can see using - "git branch -r". + "git branch -r".
pack
@@ -1941,7 +1946,7 @@ This commit is referred to as a "merge commit", or sometimes just a
refspec
- A refspec is used by fetch and + A "refspec" is used by fetch and push to describe the mapping between remote ref and local ref. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. @@ -1955,11 +1960,12 @@ This commit is referred to as a "merge commit", or sometimes just a
repository
- A collection of refs together with an + A collection of refs together with an object database containing all objects which are reachable from the refs, possibly - accompanied by meta data from one or more porcelains. A - repository can share an object database with other repositories. + accompanied by meta data from one or more porcelains. A + repository can share an object database with other repositories + via alternates mechanism.
resolve
@@ -1987,8 +1993,8 @@ This commit is referred to as a "merge commit", or sometimes just a
shallow repository
- A shallow repository has an incomplete - history some of whose commits have parents cauterized away (in other + A shallow repository has an incomplete + history some of whose commits have parents cauterized away (in other words, git is told to pretend that these commits do not have the parents, even though they are recorded in the commit 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 @@ -2007,7 +2013,7 @@ This commit is referred to as a "merge commit", or sometimes just a
tag
- A ref pointing to a tag or + A ref pointing to a tag or commit object. In contrast to a head, a tag is not changed by a commit. Tags (not tag objects) are stored in $GIT_DIR/refs/tags/. A @@ -2021,7 +2027,7 @@ This commit is referred to as a "merge commit", or sometimes just a An object containing a ref pointing to another object, which can contain a message just like a commit object. It can also contain a (PGP) - signature, in which case it is called a "signed tag object". + signature, in which case it is called a "signed tag object".
topic branch
@@ -2042,7 +2048,7 @@ This commit is referred to as a "merge commit", or sometimes just a
tree
- Either a working tree, or a tree object together with the dependent blob and tree objects + Either a working tree, or a tree object together with the dependent blob and tree objects (i.e. a stored representation of a working tree).
tree object