Merge branch 'bw/log-all-ref-updates-doc'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 8b0080a97759314e7b5f9c0c404c4e7d4af0a401..1320c873ad61281ef33891170da8683dc785f011 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -114,6 +114,12 @@ tar.<format>.command::
 The "tar.gz" and "tgz" formats are defined automatically and default to
 `gzip -cn`. You may override them with custom commands.
 
+tar.<format>.remote::
+       If true, enable `<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
 ----------