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
git-mirror · Sep 11, 2012 · f6854ca · f6854ca
2 parents fe31b2a + d1e1fe7
commit f6854ca
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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