Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0: Documentation: git-archive: mark --format as optional in summary
git-mirror · Aug 28, 2009 · 66fd74e · 66fd74e
2 parents 0d50556 + 82d97da
commit 66fd74e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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...]