Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index e5878bd97be849046951b06235fa19bf8aef7b1c..25c431d3c552d523c79473cf10867a3cab00c259 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -30,8 +30,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
        Print out objects that exist but that aren't reachable from any
        of the reference nodes.
 
---dangling::
---no-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.
 
@@ -78,8 +77,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
        a blob, the contents are written into the file, rather than
        its object name.
 
---progress::
---no-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