index ab0f8f48655e27ee7b99a5e4c30e098a84cbcae5..5868d587a905e0aaa55194c7716f9e258a030474 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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.
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.