Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
Documentation: git-archive: mark --format as optional in summary

diff --combined Documentation/git-archive.txt
index ad38f7f39db8d3b973f0ede255f65bb0627bb416,818ce942606ddf27b6eeffa6111b50cf0c559743..105a31a088c7846c0844d8f844eaba46061a3172
--- 1/Documentation/git-archive.txt
--- 2/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -9,7 -9,7 +9,7 @@@ git-archive - Create an archive of file
  SYNOPSIS
  --------
  [verse]
- 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+ 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
  
@@@ -22,7 -22,7 +22,7 @@@ prepended to the filenames in the archi
  
  'git-archive' behaves differently when given a tree ID versus when
  given a commit ID or tag ID.  In the first case the current time is
 -used as modification time of each file in the archive.  In the latter
 +used as the modification time of each file in the archive.  In the latter
  case the commit time as recorded in the referenced commit object is
  used instead.  Additionally the commit ID is stored in a global
  extended pax header if the tar format is used; it can be extracted
@@@ -48,11 -48,11 +48,11 @@@ OPTION
        Prepend <prefix>/ to each filename in the archive.
  
  <extra>::
 -      This can be any options that the archiver backend understand.
 +      This can be any options that the archiver backend understands.
        See next section.
  
  --remote=<repo>::
 -      Instead of making a tar archive from local repository,
 +      Instead of making a tar archive from the local repository,
        retrieve a tar archive from a remote repository.
  
  --exec=<git-upload-archive>::
@@@ -88,24 -88,12 +88,24 @@@ tar.umask:
        archiving user's umask will be used instead.  See umask(2) for
        details.
  
 +ATTRIBUTES
 +----------
 +
 +export-ignore::
 +      Files and directories with the attribute export-ignore won't be
 +      added to archive files.  See linkgit:gitattributes[5] for details.
 +
 +export-subst::
 +      If the attribute export-subst is set for a file then git will
 +      expand several placeholders when adding this file to an archive.
 +      See linkgit:gitattributes[5] for details.
 +
  EXAMPLES
  --------
  git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)::
  
        Create a tar archive that contains the contents of the
 -      latest commit on the current branch, and extracts it in
 +      latest commit on the current branch, and extract it in the
        `/var/tmp/junk` directory.
  
  git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz::
@@@ -122,11 -110,6 +122,11 @@@ git archive --format=zip --prefix=git-d
        Put everything in the current head's Documentation/ directory
        into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'.
  
 +
 +SEE ALSO
 +--------
 +linkgit:gitattributes[5]
 +
  Author
  ------
  Written by Franck Bui-Huu and Rene Scharfe.