Merge branch 'rs/empty-archive'

diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index ba7240c36377729bf60bcf0ec925e91e617c02d1..0827f691396ba698d3976eba1eddedd9e7ff3e9e 100644 (file)
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -162,8 +162,8 @@ Miscellaneous capabilities
        For remote helpers that implement 'import' or 'export', this capability
        allows the refs to be constrained to a private namespace, instead of
        writing to refs/heads or refs/remotes directly.
-       It is recommended that all importers providing the 'import' or 'export'
-       capabilities use this.
+       It is recommended that all importers providing the 'import'
+       capability use this. It's mandatory for 'export'.
 +
 A helper advertising the capability
 `refspec refs/heads/*:refs/svn/origin/branches/*`
@@ -202,6 +202,10 @@ there is an implied `refspec *:*`.
        marks specified in <file> before processing any input. For details,
        read up on '--import-marks=<file>' in linkgit:git-fast-export[1].
 
+'signed-tags'::
+       This modifies the 'export' capability, instructing Git to pass
+       '--signed-tags=verbatim' to linkgit:git-fast-export[1].  In the
+       absence of this capability, Git will use '--signed-tags=warn-strip'.