From 4f1d8c48d0527535cace5f7f7b25e546a7ba7dab Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 3 Mar 2008 02:01:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.3-422-g34cd6 --- config.txt | 6 ++++++ git-config.html | 13 ++++++++++++- git-cvsimport.html | 6 ++++-- git-cvsimport.txt | 6 +++++- git-describe.html | 16 +++++++++++++++- git-describe.txt | 9 +++++++++ git-grep.html | 4 ++-- git-grep.txt | 2 +- git-index-pack.html | 10 +++++++++- git-index-pack.txt | 3 +++ git-log.html | 10 +--------- git-rebase.html | 3 ++- git-rebase.txt | 1 + git-rev-list.html | 2 +- git-unpack-objects.html | 10 +++++++++- git-unpack-objects.txt | 3 +++ git-verify-pack.html | 6 +++--- git-verify-pack.txt | 4 ++-- rev-list-options.txt | 2 ++ technical/api-run-command.html | 8 ++++---- technical/api-run-command.txt | 6 +++--- 21 files changed, 97 insertions(+), 33 deletions(-) diff --git a/config.txt b/config.txt index 4027726f2..2091caa11 100644 --- a/config.txt +++ b/config.txt @@ -939,6 +939,12 @@ imap:: The configuration variables in the 'imap' section are described in linkgit:git-imap-send[1]. +receive.fsckObjects:: + If it is set to true, git-receive-pack will check all received + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + The default value is true. + receive.unpackLimit:: If the number of objects received in a push is below this limit then the objects will be unpacked into loose object diff --git a/git-config.html b/git-config.html index c826e1a0b..1815c6e57 100644 --- a/git-config.html +++ b/git-config.html @@ -2247,6 +2247,17 @@ imap

+receive.fsckObjects +
+
+

+ If it is set to true, git-receive-pack will check all received + objects. It will abort in the case of a malformed object or a + broken link. The result of an abort are only dangling objects. + The default value is true. +

+
+
receive.unpackLimit
@@ -2308,7 +2319,7 @@ web.browser diff --git a/git-cvsimport.html b/git-cvsimport.html index 6b7338f2d..11c1b8e49 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -430,7 +430,7 @@ the old cvs2git tool.

Attempt to detect merges based on the commit message. This option - will enable default regexes that try to capture the name source + will enable default regexes that try to capture the source branch name from the commit message.

@@ -443,6 +443,8 @@ the old cvs2git tool.

regex. It can be used with -m to enable the default regexes as well. You must escape forward slashes.

+

The regex must capture the source branch name in $1.

+

This option can be used several times to provide several detection regexes.

-S <regex> @@ -526,7 +528,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 6f91b9ea2..58eefd42e 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -102,13 +102,17 @@ If you need to pass multiple options, separate them with a comma. -m:: Attempt to detect merges based on the commit message. This option - will enable default regexes that try to capture the name source + will enable default regexes that try to capture the source branch name from the commit message. -M :: Attempt to detect merges based on the commit message with a custom regex. It can be used with '-m' to enable the default regexes as well. You must escape forward slashes. ++ +The regex must capture the source branch name in $1. ++ +This option can be used several times to provide several detection regexes. -S :: Skip paths matching the regex. diff --git a/git-describe.html b/git-describe.html index 6e851d7d6..94d633db8 100644 --- a/git-describe.html +++ b/git-describe.html @@ -361,6 +361,20 @@ additional commits and the abbreviated object name of the commit.

+--long +
+
+

+ Always output the long format (the tag, the number of commits + and the abbreviated commit name) even when it matches a tag. + This is useful when you want to see parts of the commit object name + in "describe" output, even when the commit in question happens to be + a tagged version. Instead of just emitting the tag name, it will + describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2 + that points at object deadbeef….). +

+
+
--match <pattern>
@@ -447,7 +461,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index fbb40a291..d9aa2f298 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -56,6 +56,15 @@ OPTIONS being employed to standard error. The tag name will still be printed to standard out. +--long:: + Always output the long format (the tag, the number of commits + and the abbreviated commit name) even when it matches a tag. + This is useful when you want to see parts of the commit object name + in "describe" output, even when the commit in question happens to be + a tagged version. Instead of just emitting the tag name, it will + describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2 + that points at object deadbeef....). + --match :: Only consider tags matching the given pattern (can be used to avoid leaking private tags made from the repository). diff --git a/git-grep.html b/git-grep.html index ea369821f..4f953b092 100644 --- a/git-grep.html +++ b/git-grep.html @@ -401,7 +401,7 @@ registered in the index file, or given tree objects.

Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatability with git-diff, --name-only is a + For better compatibility with git-diff, --name-only is a synonym for --files-with-matches.

@@ -530,7 +530,7 @@ revamped by Junio C Hamano.

diff --git a/git-grep.txt b/git-grep.txt index 71a73354f..a97f0557f 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -78,7 +78,7 @@ OPTIONS -l | --files-with-matches | --name-only | -L | --files-without-match:: Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. - For better compatability with git-diff, --name-only is a + For better compatibility with git-diff, --name-only is a synonym for --files-with-matches. -c | --count:: diff --git a/git-index-pack.html b/git-index-pack.html index 28ba3ae79..05e36846c 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -373,6 +373,14 @@ objects/pack/ directory of a git repository.

64-bit index entries on objects located above the given offset.

+
+--strict +
+
+

+ Die, if the pack contains broken objects or links. +

+

Note

@@ -398,7 +406,7 @@ mentioned above.

diff --git a/git-index-pack.txt b/git-index-pack.txt index 72b5d0011..a7825b614 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -75,6 +75,9 @@ OPTIONS to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset. +--strict:: + Die, if the pack contains broken objects or links. + Note ---- diff --git a/git-log.html b/git-log.html index 0c3eba74d..eb1872eaf 100644 --- a/git-log.html +++ b/git-log.html @@ -1013,14 +1013,6 @@ limiting may be applied.

---max-age=timestamp, --min-age=timestamp -
-
-

- Limit the commits output to specified time range. -

-
-
--author=pattern, --committer=pattern
@@ -1916,7 +1908,7 @@ reversible operation.

diff --git a/git-rebase.html b/git-rebase.html index d0cc962e9..bdc1516cf 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -274,6 +274,7 @@ git-rebase(1) Manual Page
git-rebase [-i | --interactive] [-v | --verbose] [-m | --merge] + [-s <strategy> | --strategy=<strategy>] [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>] git-rebase --continue | --skip | --abort
@@ -831,7 +832,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-rebase.txt b/git-rebase.txt index c11c6453e..4b1030474 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -9,6 +9,7 @@ SYNOPSIS -------- [verse] 'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] + [-s | --strategy=] [-C] [ --whitespace=
+
+--strict +
+
+

+ Don't write objects with broken content or links. +

+

Author

@@ -333,7 +341,7 @@ new packs and replace existing ones.

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index b79be3fd4..3697896a0 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt @@ -40,6 +40,9 @@ OPTIONS and make the best effort to recover as many objects as possible. +--strict:: + Don't write objects with broken content or links. + Author ------ diff --git a/git-verify-pack.html b/git-verify-pack.html index 5a792458b..2be9d3da0 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -315,12 +315,12 @@ corresponding pack file.

When specifying the -v option the format used is:

-
SHA1 type size offset-in-packfile
+
SHA1 type size size-in-pack-file offset-in-packfile

for objects that are not deltified in the pack, and

-
SHA1 type size offset-in-packfile depth base-SHA1
+
SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1

for objects that are deltified.

@@ -338,7 +338,7 @@ corresponding pack file.

diff --git a/git-verify-pack.txt b/git-verify-pack.txt index db019a2b8..ba2a15729 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -32,11 +32,11 @@ OUTPUT FORMAT ------------- When specifying the -v option the format used is: - SHA1 type size offset-in-packfile + SHA1 type size size-in-pack-file offset-in-packfile for objects that are not deltified in the pack, and - SHA1 type size offset-in-packfile depth base-SHA1 + SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1 for objects that are deltified. diff --git a/rev-list-options.txt b/rev-list-options.txt index 259072c07..2648a5508 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -130,9 +130,11 @@ limiting may be applied. Show commits older than a specific date. +ifdef::git-rev-list[] --max-age='timestamp', --min-age='timestamp':: Limit the commits output to specified time range. +endif::git-rev-list[] --author='pattern', --committer='pattern':: diff --git a/technical/api-run-command.html b/technical/api-run-command.html index 98ecb6a4e..67e1b63ec 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html @@ -333,7 +333,7 @@ produces in the caller in order to process it.

- Wait for the completeion of an asynchronous function that was + Wait for the completion of an asynchronous function that was started with start_async().

@@ -465,8 +465,8 @@ If the string is of the form "VAR=value", i.e. it contains =

  • -If the string does not contain =, it names an environement - variable that will be removed from the child process's envionment. +If the string does not contain =, it names an environment + variable that will be removed from the child process's environment.

    • @@ -563,7 +563,7 @@ It must not change the program's state that the caller of the diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt index dfbf9ac5d..fde3b4532 100644 --- a/technical/api-run-command.txt +++ b/technical/api-run-command.txt @@ -49,7 +49,7 @@ Functions `finish_async`:: - Wait for the completeion of an asynchronous function that was + Wait for the completion of an asynchronous function that was started with start_async(). @@ -121,8 +121,8 @@ string pointers (NULL terminated) in .env: . If the string is of the form "VAR=value", i.e. it contains '=' the variable is added to the child process's environment. -. If the string does not contain '=', it names an environement - variable that will be removed from the child process's envionment. +. If the string does not contain '=', it names an environment + variable that will be removed from the child process's environment. To specify a new initial working directory for the sub-process, specify it in the .dir member. -- 2.26.2