diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:16 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:16 +0900 |
commit | 9a73c958d84cb59a520213992549a8db21360314 (patch) | |
tree | df09a6a8d0b43891e6a348487010d099025bef09 | |
parent | 7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2 (diff) | |
parent | 515360f9e9be976344e3d21cf6f28dcd2ff3c4f9 (diff) | |
download | git-9a73c958d84cb59a520213992549a8db21360314.tar.gz git-9a73c958d84cb59a520213992549a8db21360314.tar.xz |
Merge branch 'jn/credential-doc-on-clear' into maint
Doc update.
* jn/credential-doc-on-clear:
credential doc: make multiple-helper behavior more prominent
-rw-r--r-- | Documentation/gitcredentials.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt index f3a75d1ce..f970196bc 100644 --- a/Documentation/gitcredentials.txt +++ b/Documentation/gitcredentials.txt @@ -101,16 +101,6 @@ $ git help credential-foo $ git config --global credential.helper foo ------------------------------------------- -If there are multiple instances of the `credential.helper` configuration -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 ------------------- @@ -162,6 +152,16 @@ helper:: shell (so, for example, setting this to `foo --option=bar` will execute `git credential-foo --option=bar` via the shell. See the manual of specific helpers for examples of their use. ++ +If there are multiple instances of the `credential.helper` configuration +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). username:: |