From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:18 +0000 (+0900)
Subject: Merge branch 'ab/gc-docs'
X-Git-Tag: v2.22.0-rc0~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac70c5313351630e44b1fe0267fb4850ebcf1f25;p=thirdparty%2Fgit.git

Merge branch 'ab/gc-docs'

Update docs around "gc".

* ab/gc-docs:
  gc docs: remove incorrect reference to gc.auto=0
  gc docs: clarify that "gc" doesn't throw away referenced objects
  gc docs: note "gc --aggressive" in "fast-import"
  gc docs: downplay the usefulness of --aggressive
  gc docs: note how --aggressive impacts --window & --depth
  gc docs: fix formatting for "gc.writeCommitGraph"
  gc docs: re-flow the "gc.*" section in "config"
  gc docs: include the "gc.*" section from "config" in "gc"
  gc docs: clean grammar for "gc.bigPackThreshold"
  gc docs: stop noting "repack" flags
  gc docs: modernize the advice for manually running "gc"
---

ac70c5313351630e44b1fe0267fb4850ebcf1f25
diff --cc Documentation/config/gc.txt
index 73c08b0c00,f732fe5bfd..02b92b18b5
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@@ -19,7 -32,11 +32,11 @@@ gc.autoPackLimit:
  	When there are more than this many packs that are not
  	marked with `*.keep` file in the repository, `git gc
  	--auto` consolidates them into one larger pack.  The
 -	default	value is 50.  Setting this to 0 disables it.
 +	default value is 50.  Setting this to 0 disables it.
+ 	Setting `gc.auto` to 0 will also disable this.
+ +
+ See the `gc.bigPackThreshold` configuration variable below. When in
+ use, it'll affect how the auto pack limit works.
  
  gc.autoDetach::
  	Make `git gc --auto` return immediately and run in background