From: Junio C Hamano <junkio@cox.net>
Date: Fri, 20 Apr 2007 06:06:21 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=754eeb33df25b5e34508c5b9cfef374f4929998d;p=git.git

Merge branch 'maint'

* maint:
  Update git-config documentation
  Fix unmatched emphasis tag in git-tutorial
  Update git-cherry-pick documentation
  Update git-archive documentation
---

754eeb33df25b5e34508c5b9cfef374f4929998d
diff --cc Documentation/git-archive.txt
index 8d1041598,59dfabed2..d3ca9a90c
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -30,12 -30,14 +30,15 @@@ OPTION
  -------
  
  --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.