diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:08 -0700 |
| commit | 486b51bc81e486c654ac35554b284816f4a6ae5c (patch) | |
| tree | baba8e65cbb7cc9cd2d730ed61c745ea2605c98e | |
| parent | 0d5d7db43553d26fdcd18948fbc6a53cd97c579f (diff) | |
| parent | 055c7e9fc64cfb1afa8952ce795fcf76514379ca (diff) | |
| download | git-486b51bc81e486c654ac35554b284816f4a6ae5c.tar.gz git-486b51bc81e486c654ac35554b284816f4a6ae5c.tar.xz | |
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
| -rw-r--r-- | Documentation/technical/pack-protocol.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index fc09c63b3..4064fc796 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; |