Merge branch 'py/submodule'

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index 415c09ba10a391cec60c939da1722c83df7cd906..3697896a06b460d9d29f962240dc46388487990a 100644 (file)
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -27,8 +27,8 @@ new packs and replace existing ones.
 OPTIONS
 -------
 -n::
-        Only list the objects that would be unpacked, don't actually unpack
-        them.
+        Dry run.  Check the pack file without actually unpacking
+       the objects.
 
 -q::
        The command usually shows percentage progress.  This
@@ -37,9 +37,12 @@ OPTIONS
 -r::
        When unpacking a corrupt packfile, the command dies at
        the first corruption.  This flag tells it to keep going
-       and make the best effort to salvage as many objects as
+       and make the best effort to recover as many objects as
        possible.
 
+--strict::
+       Don't write objects with broken content or links.
+
 
 Author
 ------
@@ -51,5 +54,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite