diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-28 05:41:37 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-28 05:41:37 +0200 |
commit | 891182f9141326fd6833d3651b89860a0b41f153 (patch) | |
tree | 72fdca8e7ad2b9a0be9098c980d6e741b91eb745 | |
parent | Round-down years in "years+months" relative date view (diff) | |
parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
download | git-891182f9141326fd6833d3651b89860a0b41f153.tar.xz git-891182f9141326fd6833d3651b89860a0b41f153.zip |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
Documentation: git-archive: mark --format as optional in summary
-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 ad38f7f39d..105a31a088 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...] |