Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index a3e36dbb0d16541baf2fe51dd053803ff9aa8cbf..9b5f3ae5ed8cf6b79545f09d68797490c69f6596 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -36,10 +36,12 @@ OPTIONS
        Format of the resulting archive: 'tar' or 'zip'.  The default
        is 'tar'.
 
---list, -l::
+-l::
+--list::
        Show all available formats.
 
---verbose, -v::
+-v::
+--verbose::
        Report progress to stderr.
 
 --prefix=<prefix>/::