diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:16 +0400 |
| commit | 367d20ec6b9e8e297537f665fb528346bd0aff27 (patch) | |
| tree | bce97747bf55c8b3adffa0a058984aba5ea3225f /Documentation/config.txt | |
| parent | d16520499d2652b5b59dfb25f9cf2d56a4c6913a (diff) | |
| parent | 861444f6d702b15713d0875ce9dc5aff64885fba (diff) | |
Merge branch 'jk/credentials'
* jk/credentials:
t: add test harness for external credential helpers
credentials: add "store" helper
strbuf: add strbuf_add*_urlencode
Makefile: unix sockets may not available on some platforms
credentials: add "cache" helper
docs: end-user documentation for the credential subsystem
credential: make relevance of http path configurable
credential: add credential.*.username
credential: apply helper config
http: use credential API to get passwords
credential: add function for parsing url components
introduce credentials API
t5550: fix typo
test-lib: add test_config_global variant
Conflicts:
strbuf.c
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8a7d2d4cb1..c6630c73e8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -834,6 +834,29 @@ commit.template:: "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the specified user's home directory. +credential.helper:: + Specify an external helper to be called when a username or + password credential is needed; the helper may consult external + storage to avoid prompting the user for the credentials. See + linkgit:gitcredentials[7] for details. + +credential.useHttpPath:: + When acquiring credentials, consider the "path" component of an http + or https URL to be important. Defaults to false. See + linkgit:gitcredentials[7] for more information. + +credential.username:: + If no username is set for a network authentication, use this username + by default. See credential.<context>.* below, and + linkgit:gitcredentials[7]. + +credential.<url>.*:: + Any of the credential.* options above can be applied selectively to + some credentials. For example "credential.https://example.com.username" + would set the default username only for https connections to + example.com. See linkgit:gitcredentials[7] for details on how URLs are + matched. + include::diff-config.txt[] difftool.<tool>.path:: |