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 --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index ad38f7f39db8d3b973f0ede255f65bb0627bb416..105a31a088c7846c0844d8f844eaba46061a3172 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -9,7 +9,7 @@ git-archive - Create an archive of files from a named tree
 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...]