Merge branch 'jk/tempfile-ferror-fclose-confusion' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 015346c4173c5f29b33445280ae849f3fcfffaa3..038a32d01b709cdf2c3f7a30893c53743271da02 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1402,6 +1402,12 @@ gc.autoDetach::
        Make `git gc --auto` return immediately and run in background
        if the system supports it. Default is true.
 
+gc.logExpiry::
+       If the file gc.log exists, then `git gc --auto` won't run
+       unless that file is more than 'gc.logExpiry' old.  Default is
+       "1.day".  See `gc.pruneExpire` for more ways to specify its
+       value.
+
 gc.packRefs::
        Running `git pack-refs` in a repository renders it
        unclonable by Git versions prior to 1.5.1.2 over dumb