From: Junio C Hamano Date: Wed, 30 Jan 2008 08:28:52 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc5-11-g0eab8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f51196d6e5d90b427ef64b6769c2c32e1577942;p=git.git Autogenerated HTML docs for v1.5.4-rc5-11-g0eab8 --- diff --git a/RelNotes-1.5.3.3.txt b/RelNotes-1.5.3.3.txt index 2a7bfdd5c..d21384695 100644 --- a/RelNotes-1.5.3.3.txt +++ b/RelNotes-1.5.3.3.txt @@ -12,7 +12,7 @@ Fixes since v1.5.3.2 * The default shell on some FreeBSD did not execute the argument parsing code correctly and made git unusable. - * git-svn incorrectly spawned pager even when the user user + * git-svn incorrectly spawned pager even when the user explicitly asked not to. * sample post-receive hook overquoted the envelope sender diff --git a/git-config.html b/git-config.html index 5b5ff9509..8d29af9f7 100644 --- a/git-config.html +++ b/git-config.html @@ -493,7 +493,7 @@ rather than from all available files.

For all options that output values and/or keys, always - end values with with the null character (instead of a + end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that @@ -2213,7 +2213,7 @@ web.browser

diff --git a/git-config.txt b/git-config.txt index e4d0e4752..fa161718d 100644 --- a/git-config.txt +++ b/git-config.txt @@ -130,7 +130,7 @@ See also <>. -z, --null:: For all options that output values and/or keys, always - end values with with the null character (instead of a + end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that diff --git a/git-cvsserver.html b/git-cvsserver.html index 4e2da4bce..d36a41f64 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -492,7 +492,7 @@ gitcvs.dbname

Database name. The exact meaning depends on the - used database driver, for SQLite this is a filename. + selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (;). Default: %Ggitcvs.%m.sqlite @@ -508,7 +508,7 @@ gitcvs.dbdriver with DBD::SQLite, reported to work with DBD::Pg, and reported not to work with DBD::mysql. Please regard this as an experimental feature. May not - contain double colons (:). + contain colons (:). Default: SQLite

@@ -691,7 +691,7 @@ Martin Langhoff <martin@catalyst.net.nz> diff --git a/git-cvsserver.txt b/git-cvsserver.txt index d75e40134..c831548d4 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -204,7 +204,7 @@ about `DBI->connect()`. gitcvs.dbname:: Database name. The exact meaning depends on the - used database driver, for SQLite this is a filename. + selected database driver, for SQLite this is a filename. Supports variable substitution (see below). May not contain semicolons (`;`). Default: '%Ggitcvs.%m.sqlite' @@ -215,7 +215,7 @@ gitcvs.dbdriver:: with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not - contain double colons (`:`). + contain colons (`:`). Default: 'SQLite' gitcvs.dbuser:: diff --git a/git-rev-parse.html b/git-rev-parse.html index 67594b99f..c197b0c27 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -680,7 +680,7 @@ A suffix : followed by a path; this names the blob or tree A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon - that follows it) names an stage 0 entry. During a merge, stage + that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch being merged. @@ -688,7 +688,7 @@ A colon, optionally followed by a stage number (0 to 3) and a

Here is an illustration, by Jon Loeliger. Both node B and C are -a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are ordered left-to-right.

@@ -740,7 +740,7 @@ It is the set of commits that are reachable from either one of and its parent commits exists. r1^@ notation means all parents of r1. r1^! includes commit r1 but excludes its all parents.

-

Here are a handful examples:

+

Here are a handful of examples:

D                G H D
@@ -834,7 +834,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 5d9c36985..af988821b 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -229,13 +229,13 @@ blobs contained in a commit. * A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon - that follows it) names an stage 0 entry. During a merge, stage + that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch being merged. Here is an illustration, by Jon Loeliger. Both node B and C are -a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are ordered left-to-right. G H I J @@ -291,7 +291,7 @@ and its parent commits exists. `r1{caret}@` notation means all parents of `r1`. `r1{caret}!` includes commit `r1` but excludes its all parents. -Here are a handful examples: +Here are a handful of examples: D G H D D F G H I J D F diff --git a/technical/racy-git.txt b/technical/racy-git.txt index 5030d9f2f..6bdf034b3 100644 --- a/technical/racy-git.txt +++ b/technical/racy-git.txt @@ -184,7 +184,7 @@ In a large project where raciness avoidance cost really matters, however, the initial computation of all object names in the index takes more than one second, and the index file is written out after all that happens. Therefore the timestamp of the -index file will be more than one seconds later than the the +index file will be more than one seconds later than the youngest file in the working tree. This means that in these cases there actually will not be any racily clean entry in the resulting index.