diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:09:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:09:01 -0700 |
| commit | f6854cad2a7a7da0a360bd520d2a86af89a36c6c (patch) | |
| tree | aee3e98cfb4fe49ad593db48b26f7d8b1b4d556c /Documentation/git-config.txt | |
| parent | Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11 (diff) | |
| parent | git-config doc: unconfuse an example (diff) | |
| download | tgif-f6854cad2a7a7da0a360bd520d2a86af89a36c6c.tar.xz | |
Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11
* mh/maint-config-doc-proxy-command:
git-config doc: unconfuse an example
git-config.txt: fix example
Diffstat (limited to 'Documentation/git-config.txt')
| -rw-r--r-- | Documentation/git-config.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index d9463cb387..5d9fd47ee3 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -258,7 +258,7 @@ Given a .git/config like this: ; Proxy settings [core] - gitproxy="proxy-command" for kernel.org + gitproxy=proxy-command for kernel.org gitproxy=default-proxy ; for all the rest you can set the filemode to true with @@ -333,7 +333,7 @@ To actually match only values with an exclamation mark, you have to To add a new proxy, without altering any of the existing ones, use ------------ -% git config core.gitproxy '"proxy-command" for example.com' +% git config --add core.gitproxy '"proxy-command" for example.com' ------------ An example to use customized color from the configuration in your |