Merge branch 'sb/string-list'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 73dc0ad0a03607db45a4f6056d9cdac58dbeca5e..179615195fd260d4d6d87bc1cda6f5c8a699719d 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -913,6 +913,10 @@ for further details.
        and read the password from its STDOUT. See also the 'core.askpass'
        option in linkgit:git-config[1].
 
+'GIT_TERMINAL_PROMPT'::
+       If this environment variable is set to `0`, git will not prompt
+       on the terminal (e.g., when asking for HTTP authentication).
+
 'GIT_CONFIG_NOSYSTEM'::
        Whether to skip reading settings from the system-wide
        `$(prefix)/etc/gitconfig` file.  This environment variable can