diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:29:24 -0700 |
| commit | 1b68962b29e39b0455e0f15d6b95edc65accb98c (patch) | |
| tree | b30eacde916593628825ddedac19074b4665f52f /Documentation | |
| parent | e13de0bdd80ca1f9e18c1d00e8d75fc6a3bc0824 (diff) | |
| parent | 24321375cda79f141be72d1a842e930df6f41725 (diff) | |
| download | git-1b68962b29e39b0455e0f15d6b95edc65accb98c.tar.gz git-1b68962b29e39b0455e0f15d6b95edc65accb98c.tar.xz | |
Merge branch 'jk/credential-clear-config'
The credential.helper configuration variable is cumulative and
there is no good way to override it from the command line. As
a special case, giving an empty string as its value now serves
as the signal to clear the values specified in various files.
* jk/credential-clear-config:
credential: let empty credential specs reset helper list
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/gitcredentials.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 2cd6bdd7d..4b85095fc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1113,8 +1113,9 @@ commit.template:: 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. + storage to avoid prompting the user for the credentials. Note + that multiple helpers may be defined. See linkgit:gitcredentials[7] + for details. credential.useHttpPath:: When acquiring credentials, consider the "path" component of an http diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt index 1c75be080..f3a75d1ce 100644 --- a/Documentation/gitcredentials.txt +++ b/Documentation/gitcredentials.txt @@ -106,6 +106,11 @@ variable, each helper will be tried in turn, and may provide a username, password, or nothing. Once Git has acquired both a username and a password, no more helpers will be tried. +If `credential.helper` is configured to the empty string, this resets +the helper list to empty (so you may override a helper set by a +lower-priority config file by configuring the empty-string helper, +followed by whatever set of helpers you would like). + CREDENTIAL CONTEXTS ------------------- |