summaryrefslogtreecommitdiff
path: root/Documentation/technical/pack-protocol.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-25 18:02:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-25 18:02:14 (GMT)
commit68538cf9545ff853518b29fcac8e6bbe00a97f56 (patch)
tree093c3bbb4e4796e8019b3aeb0f4e32242d971e8f /Documentation/technical/pack-protocol.txt
parentf2bd231414fc9c22307971bcc6c5a3a96dec75c1 (diff)
parent055c7e9fc64cfb1afa8952ce795fcf76514379ca (diff)
downloadgit-68538cf9545ff853518b29fcac8e6bbe00a97f56.zip
git-68538cf9545ff853518b29fcac8e6bbe00a97f56.tar.gz
git-68538cf9545ff853518b29fcac8e6bbe00a97f56.tar.bz2
Merge branch 'sb/pack-protocol-mention-smart-http' into maint
Doc updates. * sb/pack-protocol-mention-smart-http: Documentation/technical/pack-protocol: mention http as possible protocol
Diffstat (limited to 'Documentation/technical/pack-protocol.txt')
-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 fc09c63..4064fc7 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;