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

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

diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt
index 424e4ba84cf9b0444a41f0a163de0a58a6ac378a..39b1d8eaa1456f60af07de2e30f0653f9d5efd64 100644 (file)
--- a/Documentation/git-show-index.txt
+++ b/Documentation/git-show-index.txt
@@ -9,7 +9,7 @@ git-show-index - Show packed archive index
 SYNOPSIS
 --------
 [verse]
-'git show-index'
+'git show-index' [--object-format=<hash-algorithm>]
 
 
 DESCRIPTION
@@ -36,6 +36,15 @@ Note that you can get more information on a packfile by calling
 linkgit:git-verify-pack[1]. However, as this command considers only the
 index file itself, it's both faster and more flexible.
 
+OPTIONS
+-------
+
+--object-format=<hash-algorithm>::
+       Specify the given object format (hash algorithm) for the index file.  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..
+
 GIT
 ---
 Part of the linkgit:git[1] suite