diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:08:22 (GMT) |
commit | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (patch) | |
tree | e3640ac0242262814f2b2d4c2a01c4332faeb18c /Documentation/technical/pack-protocol.txt | |
parent | a48ce378585054f2ae3b2f0e18346ab005290524 (diff) | |
parent | 7560f547e614244fe1d4648598d4facf7ed33a56 (diff) | |
download | git-8e36002adda45a35c6fc4daf81913c3d2102cb59.zip git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.gz git-8e36002adda45a35c6fc4daf81913c3d2102cb59.tar.bz2 |
Merge branch 'ma/up-to-date'
Message and doc updates.
* ma/up-to-date:
treewide: correct several "up-to-date" to "up to date"
Documentation/user-manual: update outdated example output
Diffstat (limited to 'Documentation/technical/pack-protocol.txt')
-rw-r--r-- | Documentation/technical/pack-protocol.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index a349171..ed1eae8 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -199,7 +199,7 @@ After reference and capabilities discovery, the client can decide to terminate the connection by sending a flush-pkt, telling the server it can now gracefully terminate, and disconnect, when it does not need any pack data. This can happen with the ls-remote command, and also can happen when -the client already is up-to-date. +the client already is up to date. Otherwise, it enters the negotiation phase, where the client and server determine what the minimal packfile necessary for transport is, |