From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Aug 2019 20:12:03 +0000 (-0700)
Subject: Merge branch 'sg/fsck-config-in-doc'
X-Git-Tag: v2.23.0-rc1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14fe4af084071803ab4f16e6841ff64ba7351071?hp=c62bc49139f1d18e922fc98e35bb08b1aadbcafc

Merge branch 'sg/fsck-config-in-doc'

Doc update.

* sg/fsck-config-in-doc:
Documentation/git-fsck.txt: include fsck.* config variables
---

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
 ----------