summaryrefslogtreecommitdiff
path: root/Documentation/git-archive.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-28 03:41:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-28 03:41:37 (GMT)
commit891182f9141326fd6833d3651b89860a0b41f153 (patch)
tree72fdca8e7ad2b9a0be9098c980d6e741b91eb745 /Documentation/git-archive.txt
parent607a9e8aaa9b1a18f81ae67e40a5c8a5d1a92577 (diff)
parent66fd74ea5db13e6f095f7c414e9ea4a1aa59cdc7 (diff)
downloadgit-891182f9141326fd6833d3651b89860a0b41f153.zip
git-891182f9141326fd6833d3651b89860a0b41f153.tar.gz
git-891182f9141326fd6833d3651b89860a0b41f153.tar.bz2
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: Documentation: git-archive: mark --format as optional in summary
Diffstat (limited to 'Documentation/git-archive.txt')
-rw-r--r--Documentation/git-archive.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index ad38f7f..105a31a 100644
--- 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...]