diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-28 07:41:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-28 07:41:31 +0400 |
| commit | 66fd74ea5db13e6f095f7c414e9ea4a1aa59cdc7 (patch) | |
| tree | 20c6b4706eb2bd17cfdcacb6f52fbbba76caab0e /Documentation | |
| parent | 0d5055665ca1e76659ffa96bf972b4b0125ea069 (diff) | |
| parent | 82d97da30aba767e5c8406b595274af299858357 (diff) | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
Documentation: git-archive: mark --format as optional in summary
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-archive.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 41cbf9c081..818ce94260 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...] |