Merge branch 'js/rebase-r-strategy'

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index e0eae642c10f75cff57c0a9d07420e3218235423..d72d15be5babb2a108cf37e8ae396ae587baf1cf 100644 (file)
--- 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
 ----------