Merge branch 'maint'

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

diff --cc Documentation/git-archive.txt
index 8d1041598e566a3ffc87cbe294c7800be1ab0c60,59dfabed23696fda20d036305c98d213de2b8b9c..d3ca9a90cee97622d2a717d618da23d20aa248e4
--- 1/Documentation/git-archive.txt
--- 2/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.