summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2019-03-22 09:32:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-24 12:31:10 (GMT)
commitcf9cd771e1314ad5cd8eaf1d92b7a5fd5e6b734f (patch)
treeb0e030e863268f897c86718178e30a0e686fccc4
parentb11e8560cc1be17268136504cb80b00fbf4182dc (diff)
downloadgit-cf9cd771e1314ad5cd8eaf1d92b7a5fd5e6b734f.zip
git-cf9cd771e1314ad5cd8eaf1d92b7a5fd5e6b734f.tar.gz
git-cf9cd771e1314ad5cd8eaf1d92b7a5fd5e6b734f.tar.bz2
gc docs: stop noting "repack" flags
Remove the mention of specific flags from the "gc" documentation, and leave it at describing what we'll do instead. As seen in builtin/gc.c we'll use various repack flags depending on what we detect we need to do, so this isn't always accurate. More importantly, a subsequent change is about to remove all this documentation and replace it with an include of the gc.* docs in git-config(1). By first changing this it's easier to reason about that subsequent change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-gc.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index dd22eec..c56f4f7 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -52,14 +52,13 @@ OPTIONS
+
If the number of loose objects exceeds the value of the `gc.auto`
configuration variable, then all loose objects are combined into a
-single pack using `git repack -d -l`. Setting the value of `gc.auto`
+single pack. Setting the value of `gc.auto`
to 0 disables automatic packing of loose objects.
+
If the number of packs exceeds the value of `gc.autoPackLimit`,
then existing packs (except those marked with a `.keep` file
or over `gc.bigPackThreshold` limit)
-are consolidated into a single pack by using the `-A` option of
-'git repack'.
+are consolidated into a single pack.
If the amount of memory is estimated not enough for `git repack` to
run smoothly and `gc.bigPackThreshold` is not set, the largest
pack will also be excluded (this is the equivalent of running `git gc`