Skip to content

Commit 29093c2

Browse files
dsymondsgitster
authored andcommitted
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>
1 parent d825a97 commit 29093c2

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Example
101101

102102
# Proxy settings
103103
[core]
104-
gitProxy="ssh" for "ssh://kernel.org/"
104+
gitProxy="ssh" for "kernel.org"
105105
gitProxy=default-proxy ; for the rest
106106

107107
Variables

Documentation/git-config.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,7 @@ Given a .git/config like this:
214214

215215
; Proxy settings
216216
[core]
217-
gitproxy="ssh" for "ssh://kernel.org/"
218217
gitproxy="proxy-command" for kernel.org
219-
gitproxy="myprotocol-command" for "my://"
220218
gitproxy=default-proxy ; for all the rest
221219

222220
you can set the filemode to true with
@@ -291,7 +289,7 @@ To actually match only values with an exclamation mark, you have to
291289
To add a new proxy, without altering any of the existing ones, use
292290

293291
------------
294-
% git config core.gitproxy '"proxy" for example.com'
292+
% git config core.gitproxy '"proxy-command" for example.com'
295293
------------
296294

297295

0 commit comments

Comments
 (0)