From: Junio C Hamano Date: Tue, 11 Sep 2012 18:09:01 +0000 (-0700) Subject: Merge branch 'mh/maint-config-doc-proxy-command' into maint-1.7.11 X-Git-Tag: v1.7.11.6~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6854cad2a7a7da0a360bd520d2a86af89a36c6c?hp=fe31b2afac2fbae25086ecd00a1f57bcd74e9148 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 --- 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