Merge branch 'jc/merge-bases'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index b97aaab4edfc33f407f7d167f015b174c2ddccb5..cfa1e4ebe4860d4905c44c5428b541ce3967826b 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -65,7 +65,10 @@ OPTIONS
 
 --remote=<repo>::
        Instead of making a tar archive from the local repository,
-       retrieve a tar archive from a remote repository.
+       retrieve a tar archive from a remote repository. Note that the
+       remote repository may place restrictions on which sha1
+       expressions may be allowed in `<tree-ish>`. See
+       linkgit:git-upload-archive[1] for details.
 
 --exec=<git-upload-archive>::
        Used with --remote to specify the path to the