Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index b2a32d57c8403d5f3a48938760c18b498fc32112..d72d15be5babb2a108cf37e8ae396ae587baf1cf 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -69,6 +69,10 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
        exist). This will detect corruption in commits and trees, but
        not do any semantic checks (e.g., for format errors). Corruption
        in blob objects will not be detected at all.
++
+Unreachable tags, commits, and trees will also be accessed to find the
+tips of dangling segments of history. Use `--no-dangling` if you don't
+care about this output and want to speed it up further.
 
 --strict::
        Enable more strict checking, namely to catch a file mode
@@ -100,6 +104,11 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
        progress status even if the standard error stream is not
        directed to a terminal.
 
+CONFIGURATION
+-------------
+
+include::config/fsck.txt[]
+
 DISCUSSION
 ----------
 
@@ -144,9 +153,9 @@ dangling <type> <object>::
        The <type> object <object>, is present in the database but never
        'directly' used. A dangling commit could be a root node.
 
-sha1 mismatch <object>::
-       The database has an object who's sha1 doesn't match the
-       database value.
+hash mismatch <object>::
+       The database has an object whose hash doesn't match the
+       object database value.
        This indicates a serious data integrity problem.
 
 Environment Variables