DORMANTno replies

[PATCH] Fix documentation for core.gitproxy to reflect code

From: David Symonds <hidden>
Date: 2016-06-15 22:43:25
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

This is with respect to my earlier email about core.gitproxy. I
figured since 1.5.3 is looming it would be best to get the
documentation correct, then nag about the feature later!

Dave.

---
 Documentation/config.txt     |    2 +-
 Documentation/git-config.txt |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3135cb7..de9e72b 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 8451ccc..c3dffff 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'
 ------------


-- 
1.5.2.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help