From: Junio C Hamano Date: Sat, 12 Jan 2008 06:44:17 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e77b015d156771d6b32769e7997c455adf9db4ab;p=git.git Autogenerated HTML docs for v1.5.4-rc3 --- diff --git a/RelNotes-1.5.4.txt b/RelNotes-1.5.4.txt index c05de3d1d..7d2a973c7 100644 --- a/RelNotes-1.5.4.txt +++ b/RelNotes-1.5.4.txt @@ -61,7 +61,7 @@ Deprecation notices Updates since v1.5.3 -------------------- - * Comes with much improved gitk. + * Comes with much improved gitk, with i18n. * Comes with "git gui" 0.9.1 with i18n. @@ -358,6 +358,6 @@ series. -- exec >/var/tmp/1 -O=v1.5.4-rc2-59-g2370781 +O=v1.5.4-rc3 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/config.txt b/config.txt index 1b6d6d6fa..df091d1b8 100644 --- a/config.txt +++ b/config.txt @@ -473,7 +473,8 @@ fetch.unpackLimit:: exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, - especially on slow filesystems. + especially on slow filesystems. If not set, the value of + `transfer.unpackLimit` is used instead. format.numbered:: A boolean which can enable sequence numbers in patch subjects. @@ -499,14 +500,14 @@ gc.auto:: When there are approximately more than this many loose objects in the repository, `git gc --auto` will pack them. Some Porcelain commands use this command to perform a - light-weight garbage collection from time to time. Setting - this to 0 disables it. + light-weight garbage collection from time to time. The + default value is 6700. Setting this to 0 disables it. gc.autopacklimit:: When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc - --auto` consolidates them into one larger pack. Setting - this to 0 disables this. + --auto` consolidates them into one larger pack. The + default value is 20. Setting this to 0 disables it. gc.packrefs:: `git gc` does not run `git pack-refs` in a bare repository by @@ -861,7 +862,8 @@ receive.unpackLimit:: exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, - especially on slow filesystems. + especially on slow filesystems. If not set, the value of + `transfer.unpackLimit` is used instead. receive.denyNonFastForwards:: If set to true, git-receive-pack will deny a ref update which is @@ -872,6 +874,7 @@ receive.denyNonFastForwards:: transfer.unpackLimit:: When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. + The default value is 100. web.browser:: Specify a web browser that may be used by some commands. diff --git a/git-config.html b/git-config.html index 6dd584478..61e1f4a51 100644 --- a/git-config.html +++ b/git-config.html @@ -1392,7 +1392,8 @@ fetch.unpackLimit exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, - especially on slow filesystems. + especially on slow filesystems. If not set, the value of + transfer.unpackLimit is used instead.

@@ -1443,8 +1444,8 @@ gc.auto When there are approximately more than this many loose objects in the repository, git gc --auto will pack them. Some Porcelain commands use this command to perform a - light-weight garbage collection from time to time. Setting - this to 0 disables it. + light-weight garbage collection from time to time. The + default value is 6700. Setting this to 0 disables it.

@@ -1454,8 +1455,8 @@ gc.autopacklimit

When there are more than this many packs that are not marked with *.keep file in the repository, git gc - --auto consolidates them into one larger pack. Setting - this to 0 disables this. + --auto consolidates them into one larger pack. The + default value is 20. Setting this to 0 disables it.

@@ -2151,7 +2152,8 @@ receive.unpackLimit exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases. Storing the pack from a push can make the push operation complete faster, - especially on slow filesystems. + especially on slow filesystems. If not set, the value of + transfer.unpackLimit is used instead.

@@ -2172,6 +2174,7 @@ transfer.unpackLimit

When fetch.unpackLimit or receive.unpackLimit are not set, the value of this variable is used instead. + The default value is 100.

@@ -2200,7 +2203,7 @@ web.browser diff --git a/git-gc.html b/git-gc.html index 597e26d59..897be72a6 100644 --- a/git-gc.html +++ b/git-gc.html @@ -363,9 +363,9 @@ kept. This defaults to 60 days.

how long records of conflicted merge you have not resolved are kept. This defaults to 15 days.

The optional configuration variable gc.packrefs determines if -git gc runs git-pack-refs. Without the configuration, git-pack-refs -is not run in bare repositories by default, to allow older dumb-transport -clients fetch from the repository, but this will change in the future.

+git gc runs git-pack-refs. This can be set to "nobare" to enable +it within all non-bare repos or it can be set to a boolean value. +This defaults to true.

The optional configuration variable gc.aggressiveWindow controls how much time is spent optimizing the delta compression of the objects in the repository when the --aggressive option is specified. The larger @@ -390,7 +390,7 @@ more details. This defaults to 10.

diff --git a/git-gc.txt b/git-gc.txt index c4354bb6a..4b2dfefa6 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -90,9 +90,9 @@ how long records of conflicted merge you have not resolved are kept. This defaults to 15 days. The optional configuration variable 'gc.packrefs' determines if -`git gc` runs `git-pack-refs`. Without the configuration, `git-pack-refs` -is not run in bare repositories by default, to allow older dumb-transport -clients fetch from the repository, but this will change in the future. +`git gc` runs `git-pack-refs`. This can be set to "nobare" to enable +it within all non-bare repos or it can be set to a boolean value. +This defaults to true. The optional configuration variable 'gc.aggressiveWindow' controls how much time is spent optimizing the delta compression of the objects in diff --git a/git-relink.html b/git-relink.html index 11673d125..09e0d9b79 100644 --- a/git-relink.html +++ b/git-relink.html @@ -272,12 +272,13 @@ git-relink(1) Manual Page

SYNOPSIS

-

git-relink [--safe] <dir> <dir> [<dir>]*

+

git-relink [--safe] <dir> [<dir>]* <master_dir>

DESCRIPTION

-

This will scan 2 or more object repositories and look for common objects, check -if they are hardlinked, and replace one with a hardlink to the other if not.

+

This will scan 1 or more object repositories and look for objects in common +with a master repository. Objects not already hardlinked to the master +repository will be replaced with a hardlink to the master repository.

OPTIONS

@@ -315,7 +316,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.

diff --git a/git-relink.txt b/git-relink.txt index ccbda9fba..1b024ded3 100644 --- a/git-relink.txt +++ b/git-relink.txt @@ -7,12 +7,13 @@ git-relink - Hardlink common objects in local repositories SYNOPSIS -------- -'git-relink' [--safe] []\* +'git-relink' [--safe] []\* DESCRIPTION ----------- -This will scan 2 or more object repositories and look for common objects, check -if they are hardlinked, and replace one with a hardlink to the other if not. +This will scan 1 or more object repositories and look for objects in common +with a master repository. Objects not already hardlinked to the master +repository will be replaced with a hardlink to the master repository. OPTIONS -------