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.