Merge branch 'maint'

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index f2b8684596576cd515e617ea68f06a479348b522..9c750e24446b58efc2bd8d5e44566d060eaa353a 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -98,7 +98,8 @@ tar.umask::
        tar archive entries.  The default is 0002, which turns off the
        world write bit.  The special value "user" indicates that the
        archiving user's umask will be used instead.  See umask(2) for
-       details.
+       details.  If `--remote` is used then only the configuration of
+       the remote repository takes effect.
 
 ATTRIBUTES
 ----------