aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 16:16:02 +0900
committerJunio C Hamano <gitster@pobox.com>2018-10-16 16:16:02 +0900
commit993fa5625876306ff1de0cbc5d70fc1b232568b9 (patch)
tree3b189efca15713a184fa054404745626d9306c6b /Documentation/config.txt
parent99913dd11809b2a5d6a4644c52bc795d124d48e0 (diff)
parent3029970275b473dbf62149887a19a6b4879528d7 (diff)
downloadgit-993fa5625876306ff1de0cbc5d70fc1b232568b9.tar.gz
Merge branch 'jn/gc-auto'
"gc --auto" ended up calling exit(-1) upon error, which has been corrected to use exit(1). Also the error reporting behaviour when daemonized has been updated to exit with zero status when stopping due to a previously discovered error (which implies there is no point running gc to improve the situation); we used to exit with failure in such a case. * jn/gc-auto: gc: do not return error for prior errors in daemonized mode
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c9f8b72df7..7d58253368 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1643,7 +1643,8 @@ gc.writeCommitGraph::
for details.
gc.logExpiry::
- If the file gc.log exists, then `git gc --auto` won't run
+ If the file gc.log exists, then `git gc --auto` will print
+ its content and exit with status zero instead of running
unless that file is more than 'gc.logExpiry' old. Default is
"1.day". See `gc.pruneExpire` for more ways to specify its
value.