diff options
| author | Knut Franke <k.franke@science-computing.de> | 2010-08-30 15:40:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 10:49:30 -0700 |
| commit | 453842c9b81c6bb1328b0dfc351745615004a77f (patch) | |
| tree | 7ce52e71d6bdc8a24230d0422b8ba9baad310dc4 | |
| parent | 90e87b017f93fc606e2d6956766b32e56b4a9a2e (diff) | |
| download | git-453842c9b81c6bb1328b0dfc351745615004a77f.tar.gz git-453842c9b81c6bb1328b0dfc351745615004a77f.tar.xz | |
Extend documentation of core.askpass and GIT_ASKPASS.
Signed-off-by: Knut Franke <k.franke@science-computing.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b9ab7dfa0..12b7ebfaf 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -453,8 +453,11 @@ core.excludesfile:: core.askpass:: Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given - via the value of this variable when it is set, and the - environment variable `GIT_ASKPASS` is not set. + via the value of this variable. Can be overridden by the 'GIT_ASKPASS' + environment variable. If not set, fall back to the value of the + 'SSH_ASKPASS' environment variable or, failing that, a simple password + prompt. The external program shall be given a suitable prompt as + command line argument and write the password on its STDOUT. core.editor:: Commands such as `commit` and `tag` that lets you edit diff --git a/Documentation/git.txt b/Documentation/git.txt index 27ece5885..39504e8d0 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -634,6 +634,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', |