diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-08 09:17:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-08 09:17:01 -0700 |
commit | b815a726e9da97924b44d551b10d3fef3b3d1885 (patch) | |
tree | a1d0fe2b25ce93d7e1e4aad225b551018d3ca22e /environment.c | |
parent | e250c5914fd151caf228cbda6c30560c266bcfef (diff) | |
parent | 453842c9b81c6bb1328b0dfc351745615004a77f (diff) | |
download | git-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.gz |
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 'environment.c')
-rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 9425606443..2d0c315379 100644 --- a/environment.c +++ b/environment.c @@ -37,6 +37,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024; const char *pager_program; int pager_use_color = 1; const char *editor_program; +const char *askpass_program; const char *excludes_file; enum auto_crlf auto_crlf = AUTO_CRLF_FALSE; int read_replace_refs = 1; |