Merge branch 'maint'

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index df9ea8df0b9d35103485e4eeb94bcae6c4b27ab5..eff91889d7aab1a5262aad2f22855b52716a820d 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
         [--[no-]full] [--strict] [--verbose] [--lost-found]
-        [--[no-]progress] [<object>*]
+        [--[no-]dangling] [--[no-]progress] [<object>*]
 
 DESCRIPTION
 -----------
@@ -30,6 +30,11 @@ index file, all SHA1 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::
+       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.
 
@@ -51,7 +56,7 @@ index file, all SHA1 references in `refs` namespace, and all reflogs
        ($GIT_DIR/objects), but also the ones found in alternate
        object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES
        or $GIT_DIR/objects/info/alternates,
-       and in packed git archives found in $GIT_DIR/objects/pack
+       and in packed Git archives found in $GIT_DIR/objects/pack
        and corresponding pack subdirectories in alternate
        object pools.  This is now default; you can turn it off
        with --no-full.
@@ -59,8 +64,8 @@ index file, all SHA1 references in `refs` namespace, and all reflogs
 --strict::
        Enable more strict checking, namely to catch a file mode
        recorded with g+w bit set, which was created by older
-       versions of git.  Existing repositories, including the
-       Linux kernel, git itself, and sparse repository have old
+       versions of Git.  Existing repositories, including the
+       Linux kernel, Git itself, and sparse repository have old
        objects that triggers this check, but it is recommended
        to check new projects with this flag.