summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid Symonds <dsymonds@gmail.com>2007-08-03 08:45:56 +1000
committerJunio C Hamano <gitster@pobox.com>2007-08-02 17:26:07 -0700
commit29093c28a21d75500e9388ad103b9af9a0bab1ae (patch)
tree196cf67c20b63111acca1ac6f77570e786e283ea /Documentation
parentd825a974950b397c6ffbf44b84a7158bfcaba819 (diff)
downloadgit-29093c28a21d75500e9388ad103b9af9a0bab1ae.tar.gz
Fix documentation for core.gitproxy to reflect code
The current implementation of core.gitproxy only operates on git:// URLs, so the ssh:// examples and custom protocol examples have been removed or edited. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/git-config.txt4
2 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3135cb7a66..de9e72b562 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -101,7 +101,7 @@ Example
# Proxy settings
[core]
- gitProxy="ssh" for "ssh://kernel.org/"
+ gitProxy="ssh" for "kernel.org"
gitProxy=default-proxy ; for the rest
Variables
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 8451cccf8a..c3dffffe32 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -214,9 +214,7 @@ Given a .git/config like this:
; Proxy settings
[core]
- gitproxy="ssh" for "ssh://kernel.org/"
gitproxy="proxy-command" for kernel.org
- gitproxy="myprotocol-command" for "my://"
gitproxy=default-proxy ; for all the rest
you can set the filemode to true with
@@ -291,7 +289,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" for example.com'
+% git config core.gitproxy '"proxy-command" for example.com'
------------