From: Junio C Hamano Date: Sat, 2 Jun 2007 21:13:44 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-167-g4bc70 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=679d22d20cf456c6384e077487dea82d623b8441;p=git.git Autogenerated HTML docs for v1.5.2-167-g4bc70 --- diff --git a/config.txt b/config.txt index 3d8f03dfe..5868d587a 100644 --- a/config.txt +++ b/config.txt @@ -259,7 +259,8 @@ Common unit suffixes of 'k', 'm', or 'g' are supported. core.excludeFile:: In addition to '.gitignore' (per-directory) and '.git/info/exclude', git looks into this file for patterns - of files which are not meant to be tracked. + of files which are not meant to be tracked. See + gitlink:gitignore[5]. alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. @@ -567,6 +568,15 @@ pack.compression:: slowest. If not set, defaults to core.compression. If that is not set, defaults to -1. +pack.deltaCacheSize:: + The maxium memory in bytes used for caching deltas in + gitlink:git-pack-objects[1]. + A value of 0 means no limit. Defaults to 0. + +pack.deltaCacheLimit:: + The maxium size of a delta, that is cached in + gitlink:git-pack-objects[1]. Defaults to 1000. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/core-tutorial.html b/core-tutorial.html index 7daeca47a..0735fb2f4 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1968,7 +1968,7 @@ to follow, not easier.

diff --git a/cvs-migration.html b/cvs-migration.html index ec563638e..58b27d367 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -416,7 +416,7 @@ repositories without the need for a central maintainer.

diff --git a/diffcore.html b/diffcore.html index c48f702d3..d88be97f4 100644 --- a/diffcore.html +++ b/diffcore.html @@ -541,7 +541,7 @@ t diff --git a/everyday.html b/everyday.html index 1648f0989..e8e468334 100644 --- a/everyday.html +++ b/everyday.html @@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index 7b7725d1d..183f2b112 100644 --- a/git-add.html +++ b/git-add.html @@ -555,7 +555,7 @@ diff diff --git a/git-am.html b/git-am.html index 1d643e28c..c96c821ef 100644 --- a/git-am.html +++ b/git-am.html @@ -276,8 +276,8 @@ git-am(1) Manual Page
git-am [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] [--3way] [--interactive] [--binary] [--whitespace=<option>] [-C<n>] [-p<n>] - <mbox>|<Maildir>…
-

git-am [--skip | --resolved]

+ <mbox>|<Maildir>… +git-am [--skip | --resolved]

DESCRIPTION

@@ -510,7 +510,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 25cf84a0c..f78e5dc28 100644 --- a/git-am.txt +++ b/git-am.txt @@ -13,7 +13,6 @@ SYNOPSIS [--3way] [--interactive] [--binary] [--whitespace=