Merge fixes up to GIT 1.2.2

diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt
index cd74ffd3912adee956bf139c453092635b5650c2..d032280e7c80b0dfdfd9ffd55e9056fec6401b58 100644 (file)
--- a/Documentation/git-verify-pack.txt
+++ b/Documentation/git-verify-pack.txt
@@ -8,7 +8,7 @@ git-verify-pack - Validate packed git archive files.
 
 SYNOPSIS
 --------
-'git-verify-pack' [-v] <pack>.idx ...
+'git-verify-pack' [-v] [--] <pack>.idx ...
 
 
 DESCRIPTION
@@ -25,6 +25,8 @@ OPTIONS
 -v::
        After verifying the pack, show list of objects contained
        in the pack.
+--::
+       Do not interpret any more arguments as options.
 
 OUTPUT FORMAT
 -------------