summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-08 16:17:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-08 16:17:01 (GMT)
commitb815a726e9da97924b44d551b10d3fef3b3d1885 (patch)
treea1d0fe2b25ce93d7e1e4aad225b551018d3ca22e /Documentation/git.txt
parente250c5914fd151caf228cbda6c30560c266bcfef (diff)
parent453842c9b81c6bb1328b0dfc351745615004a77f (diff)
downloadgit-b815a726e9da97924b44d551b10d3fef3b3d1885.zip
git-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.gz
git-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.bz2
Merge branch 'kf/askpass-config'
* kf/askpass-config: Extend documentation of core.askpass and GIT_ASKPASS. Allow core.askpass to override SSH_ASKPASS. Add a new option 'core.askpass'.
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 93e3b07..e341075 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -639,6 +639,13 @@ Usually it is easier to configure any desired options through your
personal `.ssh/config` file. Please consult your ssh documentation
for further details.
+'GIT_ASKPASS'::
+ If this environment variable is set, then git commands which need to
+ acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
+ will call this program with a suitable prompt as command line argument
+ and read the password from its STDOUT. See also the 'core.askpass'
+ option in linkgit:git-config[1].
+
'GIT_FLUSH'::
If this environment variable is set to "1", then commands such
as 'git blame' (in incremental mode), 'git rev-list', 'git log',