Commit Diff

Commit:
a2dbf179c83e4b4b4268d26b32332ce3f25ed209
From:
James Cook <falsifian@falsifian.org>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
update protocol lists Document http and https protocols in got.conf(5). Copied from got(1) except reworded the part that referred to got.conf(5). Change "send directive" to "send block" in got(1), since got.conf(5) says there's "one configuration directive per line". Adjust table widths: longest protocol name is now "https".
Actions:
Patch | Tree
commit - 4fab33118efc47ea9fc567c240b00008710e7607
commit + a2dbf179c83e4b4b4268d26b32332ce3f25ed209
blob - 59890cb8a1a778ec76fcdca844df0b233f20c342
blob + a36755abe9a86dda460f66de1cb5275ad1ac57b9
--- got/got.1
+++ got/got.1
@@ -164,7 +164,7 @@ the server:
 .Lk scheme://hostname:port/path/to/repository
 .Pp
 The following protocol schemes are supported:
-.Bl -tag -width git+ssh
+.Bl -tag -width https
 .It git
 The Git protocol as implemented by the
 .Xr git-daemon 1
@@ -195,9 +195,9 @@ and
 .Cm got fetch ,
 but not by
 .Cm got send .
-Sending from a repository cloned over HTTP will require use of the
+Sending from a repository cloned over HTTP will require use of a
 .Ic send
-directive in
+block in
 .Xr got.conf 5
 to ensure that the
 .Dq ssh://
blob - bb1b429cb794d503427bb30013657dedaf519765
blob + a7c934b1b69dc8575a26bd6cdc6563fc9a5bca2e
--- got/got.conf.5
+++ got/got.conf.5
@@ -126,14 +126,14 @@ Defines the protocol to use for communicating with the
 server.
 .Pp
 The following protocol schemes are supported:
-.Bl -tag -width git+ssh
+.Bl -tag -width https
 .It git
 The Git protocol as implemented by the
 .Xr git-daemon 1
 server.
 Use of this protocol is discouraged since it supports neither authentication
 nor encryption.
-.It git+ssh
+.It git
 The Git protocol wrapped in an authenticated and encrypted
 .Xr ssh 1
 tunnel.
@@ -141,8 +141,35 @@ With this protocol the hostname may contain an embedde
 .Xr ssh 1
 to use:
 .Mt user@hostname
-.It ssh
-Short alias for git+ssh.
+.It http
+The
+.Dq smart
+Git HTTP protocol.
+Not compatible with servers using the
+.Dq dumb
+Git HTTP protocol.
+.Pp
+The
+.Dq smart
+Git HTTP protocol is supported by
+.Cm got clone
+and
+.Cm got fetch ,
+but not by
+.Cm got send .
+To send from a repository cloned over HTTP, add a
+.Ic send
+block (see below) to ensure that the
+.Dq ssh://
+protocol will be used by
+.Cm got send .
+.Pp
+Use of this protocol is discouraged since it supports neither authentication
+nor encryption.
+.It https
+The
+.Dq smart
+Git HTTP protocol wrapped in SSL/TLS.
 .El
 .It Ic port Ar port
 Defines the port to use for connecting to the remote repository's server.