Merge branch 'maint'

diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 72b5d001161f8a05e9c132b15409d7a504b0ced3..a7825b6144b67d486b5b81be0217b57db5197e65 100644 (file)
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -75,6 +75,9 @@ OPTIONS
        to force the version for the generated pack index, and to force
        64-bit index entries on objects located above the given offset.
 
+--strict::
+       Die, if the pack contains broken objects or links.
+
 
 Note
 ----