diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-04 14:38:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-04 14:38:56 -0800 |
| commit | fb5ffde2582ad9b996f1bac8b5b282e9f13953fa (patch) | |
| tree | 5588535295efdcd7af49fe27f69f1e48593596f9 /config.txt | |
| parent | 6bc98f21acd99c9e21d29b44300620a04ae9442d (diff) | |
| download | git-htmldocs-fb5ffde2582ad9b996f1bac8b5b282e9f13953fa.tar.gz | |
Autogenerated HTML docs for v2.2.0-rc0-2-gf745ac
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config.txt b/config.txt index 7a3294d94..e8dd76d97 100644 --- a/config.txt +++ b/config.txt @@ -1210,7 +1210,7 @@ gc.autopacklimit:: default value is 50. Setting this to 0 disables it. gc.autodetach:: - Make `git gc --auto` return immediately andrun in background + Make `git gc --auto` return immediately and run in background if the system supports it. Default is true. gc.packrefs:: @@ -1357,7 +1357,7 @@ gpg.program:: same command-line interface as GPG, namely, to verify a detached signature, "gpg --verify $file - <$signature" is run, and the program is expected to signal a good signature by exiting with - code 0, and to generate an ascii-armored detached signature, the + code 0, and to generate an ASCII-armored detached signature, the standard input of "gpg -bsau $key" is fed with the contents to be signed, and the program is expected to send the result to its standard output. @@ -1592,7 +1592,7 @@ http.useragent:: Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable. http.<url>.*:: - Any of the http.* options above can be applied selectively to some urls. + Any of the http.* options above can be applied selectively to some URLs. For a config key to match a URL, each element of the config key is compared to that of the URL, in the following order: + @@ -1631,8 +1631,8 @@ if the URL is `https://user@example.com/foo/bar` a config key match of + All URLs are normalized before attempting any matching (the password part, if embedded in the URL, is always ignored for matching purposes) so that -equivalent urls that are simply spelled differently will match properly. -Environment variable settings always override any matches. The urls that are +equivalent URLs that are simply spelled differently will match properly. +Environment variable settings always override any matches. The URLs that are matched against are those given directly to Git commands. This means any URLs visited as a result of a redirection do not participate in matching. |