aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-29 14:50:30 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-29 14:50:31 -0700
commit9a245ac2d38c5895f7c981ce15b19e40d9d0913f (patch)
treed254c6b7c23bc9180c7b4a20552b568cd715c8b0 /Documentation/git-config.txt
parent7bcb7473bb14943e172d3dc1dcbf42872b654cba (diff)
parentd1e1fe7569835901090b936f984117b15df43bec (diff)
downloadgit-9a245ac2d38c5895f7c981ce15b19e40d9d0913f.tar.gz
Merge branch 'mh/maint-config-doc-proxy-command'
* 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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 2d6ef32a08..490868eb23 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -267,7 +267,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
@@ -342,7 +342,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