@@ -6,3 +6,21 @@ tar.umask::
linkgit:git-archive[1] for
details. If `--remote` is used then only the configuration of
the remote repository takes effect.
+
+tar.<format>.command::
+ This variable specifies a shell command through which the tar
+ output generated by linkgit:git-archive[1] should be piped. The command
+ is executed using the shell with the generated tar file on its
+ standard input, and should produce the final output on its
+ standard output. Any compression-level options will be passed
+ to the command (e.g., `-9`).
++
+The `tar.gz` and `tgz` formats are defined automatically and use the
+magic command `git archive gzip` by default, which invokes an internal
+implementation of gzip.
+
+tar.<format>.remote::
+ If true, enable the format for use by remote clients via
+ linkgit:git-upload-archive[1]. Defaults to false for
+ user-defined formats, but true for the `tar.gz` and `tgz`
+ formats.
@@ -133,24 +133,6 @@ CONFIGURATION
include::config/tar.txt[]
-tar.<format>.command::
- This variable specifies a shell command through which the tar
- output generated by `git archive` should be piped. The command
- is executed using the shell with the generated tar file on its
- standard input, and should produce the final output on its
- standard output. Any compression-level options will be passed
- to the command (e.g., `-9`).
-+
-The `tar.gz` and `tgz` formats are defined automatically and use the
-magic command `git archive gzip` by default, which invokes an internal
-implementation of gzip.
-
-tar.<format>.remote::
- If true, enable the format for use by remote clients via
- linkgit:git-upload-archive[1]. Defaults to false for
- user-defined formats, but true for the `tar.gz` and `tgz`
- formats.
-
[[ATTRIBUTES]]
ATTRIBUTES
----------
Since the "tar.<format>.command" and "tar.<format>.remote" configuration was added in [1] and [2], we have not included it in the "git-config(1)" docs themselves. Since we're including "Documentation/config/tar.txt" in "Documentation/config/git-archive.txt" as of the preceding commit, let's move this documentation to the former, to be included in the latter. This is a move-only change, aside from changing the mention of "`git archive`" to "linkgit:git-archive[1]", for consistency with other such mentions. 1. 767cf4579f0 (archive: implement configurable tar filters, 2011-06-21) 2. 7b97730b764 (upload-archive: allow user to turn off filters, 2011-06-21) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Documentation/config/tar.txt | 18 ++++++++++++++++++ Documentation/git-archive.txt | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-)