Merge branch 'maint-1.5.1' into maint

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 493474b2eeabb2f7928b0e9f91cfd1ff64763a6d..721e0351c3b7b50cfeadaa64af4a9e8cd5be27d5 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -8,6 +8,7 @@ git-archive - Creates an archive of files from a named tree
 
 SYNOPSIS
 --------
+[verse]
 'git-archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
              [--remote=<repo>] <tree-ish> [path...]
 
@@ -30,11 +31,15 @@ OPTIONS
 -------
 
 --format=<fmt>::
-       Format of the resulting archive: 'tar', 'zip'...
+       Format of the resulting archive: 'tar', 'zip'...  The default
+       is 'tar'.
 
---list::
+--list, -l::
        Show all available formats.
 
+--verbose, -v::
+       Report progress to stderr.
+
 --prefix=<prefix>/::
        Prepend <prefix>/ to each filename in the archive.