Merge branch 'fixes'

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 2df77de0f3730c37bcc792c733414cde44e0c0af..b100aa765a2de023a4c18b1ef9643a03b98243c4 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -9,7 +9,7 @@ git-verify-pack - Validate packed GIT archive files.
 
 SYNOPSIS
 --------
-'git-verify-pack' <pack>.idx ...
+'git-verify-pack' [-v] <pack>.idx ...
 
 
 DESCRIPTION
@@ -23,6 +23,21 @@ OPTIONS
 <pack>.idx ...::
        The idx files to verify.
 
+-v::
+       After verifying the pack, show list of objects contained
+       in the pack.
+
+OUTPUT FORMAT
+-------------
+When specifying the -v option the format used is:
+
+       SHA1 type size offset-in-packfile
+
+for objects that are not deltified in the pack, and
+
+       SHA1 type size offset-in-packfile depth base-SHA1
+
+for objects that are deltified.
 
 Author
 ------
@@ -34,5 +49,5 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite