From d3e7da8979f6ee3edd88fe53241095921d578285 Mon Sep 17 00:00:00 2001 From: Anselm Kruis Date: Mon, 30 Aug 2010 15:38:38 +0200 Subject: Add a new option 'core.askpass'. Setting this option has the same effect as setting the environment variable 'GIT_ASKPASS'. Signed-off-by: Knut Franke Signed-off-by: Junio C Hamano --- Documentation/config.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index e75434b3ef..b9ab7dfa01 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -450,6 +450,12 @@ core.excludesfile:: to the value of `$HOME` and "{tilde}user/" to the specified user's home directory. See linkgit:gitignore[5]. +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. + core.editor:: Commands such as `commit` and `tag` that lets you edit messages by launching an editor uses the value of this -- cgit v1.2.3 From 453842c9b81c6bb1328b0dfc351745615004a77f Mon Sep 17 00:00:00 2001 From: Knut Franke Date: Mon, 30 Aug 2010 15:40:29 +0200 Subject: Extend documentation of core.askpass and GIT_ASKPASS. Signed-off-by: Knut Franke Signed-off-by: Junio C Hamano --- Documentation/config.txt | 7 +++++-- Documentation/git.txt | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index b9ab7dfa01..12b7ebfafc 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 27ece58857..39504e8d0a 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', -- cgit v1.2.3