Merge branch 'bc/sha-256-part-2'

[thirdparty/git.git] / Documentation / git-index-pack.txt

diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index d5b7560bfe2d51370c313ee006a9f0ed4388eda4..9316d9a80b0d7bb5f83f80400585fe7cb22dc723 100644 (file)
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -93,6 +93,14 @@ OPTIONS
 --max-input-size=<size>::
        Die, if the pack is larger than <size>.
 
+--object-format=<hash-algorithm>::
+       Specify the given object format (hash algorithm) for the pack.  The valid
+       values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for
+       the current repository (set by `extensions.objectFormat`), or 'sha1' if no
+       value is set or outside a repository.
++
+This option cannot be used with --stdin.
+
 NOTES
 -----