Merge branch 'jc/diff-algo-cleanup'

[git.git] / Documentation / git-fsck.txt

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index 55b33d70310a9f328edfcf3d625a0fc9ab8a192b..bbb25da2dd601cd9ddcdbeae525c82a08fbfde4a 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
 --------
 [verse]
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]

-        [--[no-]full] [--strict] [--verbose] [--lost-found] [<object>*]
+        [--[no-]full] [--strict] [--verbose] [--lost-found]
+        [--[no-]dangling] [--[no-]progress] [<object>*]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -29,6 +30,11 @@ index file, all SHA1 references in .git/refs/*, and all reflogs (unless
        Print out objects that exist but that aren't reachable from any
        of the reference nodes.
 
        Print out objects that exist but that aren't reachable from any
        of the reference nodes.
 

+--dangling::
+--no-dangling::
+       Print objects that exist but that are never 'directly' used (default).
+       `--no-dangling` can be used to omit this information from the output.
+

 --root::
        Report root nodes.
 
 --root::
        Report root nodes.
 


@@ -72,6 +78,14 @@ index file, all SHA1 references in .git/refs/*, and all reflogs (unless
        a blob, the contents are written into the file, rather than
        its object name.
 
        a blob, the contents are written into the file, rather than
        its object name.
 

+--progress::
+--no-progress::
+       Progress status is reported on the standard error stream by
+       default when it is attached to a terminal, unless
+       --no-progress or --verbose is specified. --progress forces
+       progress status even if the standard error stream is not
+       directed to a terminal.
+

 DISCUSSION
 ----------
 
 DISCUSSION
 ----------