summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2015-06-01 17:02:17 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-02 14:59:59 -0700
commit055c7e9fc64cfb1afa8952ce795fcf76514379ca (patch)
tree350c960407604bae97dcf1551394b587cdc66893
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-055c7e9fc64cfb1afa8952ce795fcf76514379ca.tar.gz
Documentation/technical/pack-protocol: mention http as possible protocolsb/pack-protocol-mention-smart-http
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/technical/pack-protocol.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 462e20645f..554b640e46 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;