From: Junio C Hamano Date: Sun, 10 Feb 2008 10:48:01 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4.1-34-g94bf X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49dccafcce2c8a846416d30bc7cac6a72d67c102;p=git.git Autogenerated HTML docs for v1.5.4.1-34-g94bf --- diff --git a/blame-options.txt b/blame-options.txt index ea1007bfb..c11bb7d36 100644 --- a/blame-options.txt +++ b/blame-options.txt @@ -52,7 +52,7 @@ of lines before or after the line given by . When is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working - tree copy has the contents of he named file (specify + tree copy has the contents of the named file (specify `-` to make the command read from the standard input). -M||:: diff --git a/config.txt b/config.txt index 4e222f15a..3e10feb9f 100644 --- a/config.txt +++ b/config.txt @@ -766,6 +766,12 @@ pack.indexVersion:: whenever the corresponding pack is larger than 2 GB. Otherwise the default is 1. +pack.packSizeLimit: + The default maximum size of a pack. This setting only affects + packing to a file, i.e. the git:// protocol is unaffected. It + can be overridden by the `\--max-pack-size` option of + linkgit:git-repack[1]. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/git-annotate.html b/git-annotate.html index 9ba942214..fdb1b2491 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -390,7 +390,7 @@ of lines before or after the line given by <start>.

When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working - tree copy has the contents of he named file (specify + tree copy has the contents of the named file (specify - to make the command read from the standard input).

@@ -454,7 +454,7 @@ commit.

diff --git a/git-blame.html b/git-blame.html index 99ad263b4..64b7fe0d3 100644 --- a/git-blame.html +++ b/git-blame.html @@ -408,7 +408,7 @@ of lines before or after the line given by <start>.

When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working - tree copy has the contents of he named file (specify + tree copy has the contents of the named file (specify - to make the command read from the standard input).

@@ -686,7 +686,7 @@ commit commentary), a blame viewer won't ever care. diff --git a/git-config.html b/git-config.html index 8d29af9f7..a92886135 100644 --- a/git-config.html +++ b/git-config.html @@ -1952,6 +1952,13 @@ pack.indexVersion the default is 1.

+ +

pack.packSizeLimit: + The default maximum size of a pack. This setting only affects + packing to a file, i.e. the git:// protocol is unaffected. It + can be overridden by the --max-pack-size option of + git-repack(1).

+
pull.octopus
@@ -2213,7 +2220,7 @@ web.browser diff --git a/git-pack-objects.html b/git-pack-objects.html index b2f730954..7d552499c 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -397,7 +397,8 @@ base-name

Maximum size of each output packfile, expressed in MiB. If specified, multiple packfiles may be created. - The default is unlimited. + The default is unlimited, unless the config variable + pack.packSizeLimit is set.

@@ -563,7 +564,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 74cc7c1cb..8353be186 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -99,7 +99,8 @@ base-name:: --max-pack-size=:: Maximum size of each output packfile, expressed in MiB. If specified, multiple packfiles may be created. - The default is unlimited. + The default is unlimited, unless the config variable + `pack.packSizeLimit` is set. --incremental:: This flag causes an object already in a pack ignored