From: Junio C Hamano Date: Tue, 16 Jun 2015 21:27:07 +0000 (-0700) Subject: Merge branch 'sb/pack-protocol-mention-smart-http' X-Git-Tag: v2.5.0-rc0~34 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/486b51bc81e486c654ac35554b284816f4a6ae5c?hp=0d5d7db43553d26fdcd18948fbc6a53cd97c579f Merge branch 'sb/pack-protocol-mention-smart-http' Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol --- diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index fc09c63b32..4064fc796f 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -1,11 +1,11 @@ Packfile transfer protocols =========================== -Git supports transferring data in packfiles over the ssh://, git:// and +Git supports transferring data in packfiles over the ssh://, git://, http:// and file:// transports. There exist two sets of protocols, one for pushing data from a client to a server and another for fetching data from a -server to a client. All three transports (ssh, git, file) use the same -protocol to transfer data. +server to a client. The three transports (ssh, git, file) use the same +protocol to transfer data. http is documented in http-protocol.txt. The processes invoked in the canonical Git implementation are 'upload-pack' on the server side and 'fetch-pack' on the client side for fetching data;