summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 12:38:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-03 12:38:47 -0700
commit8815d8aa7ccab3798fa5513821ab110c209b0ae7 (patch)
tree2f60257a462e3a3548a8363dd431b1b40ba8e856 /Documentation
parentMerge branch 'jc/fix-diff-no-index-diff-opt-parse' (diff)
parentenvironment.c: fix constness for odb_pack_keep() (diff)
downloadtgif-8815d8aa7ccab3798fa5513821ab110c209b0ae7.tar.xz
Merge branch 'nd/gc-aggressive'
Allow tweaking the maximum length of the delta-chain produced by "gc --aggressive". * nd/gc-aggressive: environment.c: fix constness for odb_pack_keep() gc --aggressive: make --depth configurable
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt5
-rw-r--r--Documentation/git-gc.txt3
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c415aadbbc..84c7e3f11a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1156,6 +1156,11 @@ filter.<driver>.smudge::
object to a worktree file upon checkout. See
linkgit:gitattributes[5] for details.
+gc.aggressiveDepth::
+ The depth parameter used in the delta compression
+ algorithm used by 'git gc --aggressive'. This defaults
+ to 250.
+
gc.aggressiveWindow::
The window size parameter used in the delta compression
algorithm used by 'git gc --aggressive'. This defaults
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index e158a3b31f..273c4663c8 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -124,6 +124,9 @@ the value, the more time is spent optimizing the delta compression. See
the documentation for the --window' option in linkgit:git-repack[1] for
more details. This defaults to 250.
+Similarly, the optional configuration variable 'gc.aggressiveDepth'
+controls --depth option in linkgit:git-repack[1]. This defaults to 250.
+
The optional configuration variable 'gc.pruneExpire' controls how old
the unreferenced loose objects have to be before they are pruned. The
default is "2 weeks ago".