Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index 3697896a06b460d9d29f962240dc46388487990a..b79be3fd4ced9dac416fb0fb7f97ab2d10775d01 100644 (file)
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -40,9 +40,6 @@ OPTIONS
        and make the best effort to recover as many objects as
        possible.
 
---strict::
-       Don't write objects with broken content or links.
-
 
 Author
 ------