git-archive: update documentation

This patch documents zip backend options.

It also adds git-archive command into the main git manual
page.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 913528d3732999fd3c5a4648b8544fc80827d3dc..031fcd5190bf4baef7d87534ef5b6a39fe8985a9 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -40,6 +40,7 @@ OPTIONS
 
 <extra>::
        This can be any options that the archiver backend understand.
 
 <extra>::
        This can be any options that the archiver backend understand.

+       See next section.

 
 --remote=<repo>::
        Instead of making a tar archive from local repository,
 
 --remote=<repo>::
        Instead of making a tar archive from local repository,


@@ -52,6 +53,18 @@ path::
        If one or more paths are specified, include only these in the
        archive, otherwise include all files and subdirectories.
 
        If one or more paths are specified, include only these in the
        archive, otherwise include all files and subdirectories.
 

+BACKEND EXTRA OPTIONS
+---------------------
+
+zip
+~~~
+-0::
+       Store the files instead of deflating them.
+-9::
+       Highest and slowest compression level.  You can specify any
+       number from 1 to 9 to adjust compression speed and ratio.
+
+

 CONFIGURATION
 -------------
 By default, file and directories modes are set to 0666 or 0777 in tar
 CONFIGURATION
 -------------
 By default, file and directories modes are set to 0666 or 0777 in tar

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1bf5ef57e41eaa74836f75d089a07c3a40f2837e..2135b65516b372587a9a4fa13daf21df05a5d1ce 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -266,6 +266,9 @@ gitlink:git-am[1]::
 gitlink:git-applymbox[1]::
        Apply patches from a mailbox, original version by Linus.
 
 gitlink:git-applymbox[1]::
        Apply patches from a mailbox, original version by Linus.
 

+gitlink:git-archive[1]::
+       Creates an archive of files from a named tree.
+

 gitlink:git-bisect[1]::
        Find the change that introduced a bug by binary search.
 
 gitlink:git-bisect[1]::
        Find the change that introduced a bug by binary search.