Merge branch 'ab/gc-docs'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:18 +0000 (16:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:18 +0000 (16:41 +0900)
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"

1  2 
Documentation/config/gc.txt
Documentation/git-fast-import.txt
index 73c08b0c00cb124b3de230f770a1c48cc27e4a21,f732fe5bfdf4df4fc7bc755e245506000d2ad391..02b92b18b5c2cf6f9d509483a4bb995f3677d519
@@@ -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
Simple merge