summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-09 15:18:18 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-09 15:18:18 -0700
commit5e864ac3485eaa54d31af4acc73a214f211b3738 (patch)
tree299ce9a06919acd18c17a45d8f14837bb95fc2c6
parentae76814c6ca1af63f947c3525dfd1a799c3d9fd4 (diff)
parentd61e6ce1dda7f4b11601a0de549feefbcec55779 (diff)
downloadgit-5e864ac3485eaa54d31af4acc73a214f211b3738.tar.gz
Merge branch 'sg/fsck-config-in-doc' into maint
Doc update. * sg/fsck-config-in-doc: Documentation/git-fsck.txt: include fsck.* config variables
-rw-r--r--Documentation/git-fsck.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index e0eae642c1..d72d15be5b 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -104,6 +104,11 @@ care about this output and want to speed it up further.
progress status even if the standard error stream is not
directed to a terminal.
+CONFIGURATION
+-------------
+
+include::config/fsck.txt[]
+
DISCUSSION
----------