Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 031fcd5190bf4baef7d87534ef5b6a39fe8985a9..4da07c158053bd037f32ff74516c7b2dfeec723b 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -3,11 +3,12 @@ git-archive(1)
 
 NAME
 ----
-git-archive - Creates a archive of the files in the named tree
+git-archive - Create 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.