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
This commit is contained in:
Junio C Hamano 2012-09-11 11:09:01 -07:00
commit f6854cad2a

View File

@ -258,7 +258,7 @@ Given a .git/config like this:
; Proxy settings ; Proxy settings
[core] [core]
gitproxy="proxy-command" for kernel.org gitproxy=proxy-command for kernel.org
gitproxy=default-proxy ; for all the rest gitproxy=default-proxy ; for all the rest
you can set the filemode to true with 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 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 An example to use customized color from the configuration in your