Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index 9b3946614fabdb62b99140bda3125ac839fa9fa0..ba2a157299566b4dcc88f8ecb6f0eaed755f95bb 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -3,17 +3,17 @@ git-verify-pack(1)
 
 NAME
 ----
-git-verify-pack - Validate packed GIT archive files.
+git-verify-pack - Validate packed git archive files
 
 
 SYNOPSIS
 --------
-'git-verify-pack' [-v] <pack>.idx ...
+'git-verify-pack' [-v] [--] <pack>.idx ...
 
 
 DESCRIPTION
 -----------
-Reads given idx file for packed GIT archive created with
+Reads given idx file for packed git archive created with
 git-pack-objects command and verifies idx file and the
 corresponding pack file.
 
@@ -25,16 +25,18 @@ OPTIONS
 -v::
        After verifying the pack, show list of objects contained
        in the pack.
+\--::
+       Do not interpret any more arguments as options.
 
 OUTPUT FORMAT
 -------------
 When specifying the -v option the format used is:
 
-       SHA1 type size offset-in-packfile
+       SHA1 type size size-in-pack-file offset-in-packfile
 
 for objects that are not deltified in the pack, and
 
-       SHA1 type size offset-in-packfile depth base-SHA1
+       SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1
 
 for objects that are deltified.
 
@@ -48,5 +50,4 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[7] suite