summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-04 21:39:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-04 21:39:16 (GMT)
commit10881f076e19fbd0fa7b753b7c6c8203b419be83 (patch)
treeed6f9e86308f23aabf160322884fb56ef87d3560 /Documentation/technical
parent80460f513ebd7851953f5402dd9744236128b240 (diff)
parent280abfd4f5055922e8abcbb988fa0a8df0eef128 (diff)
downloadgit-10881f076e19fbd0fa7b753b7c6c8203b419be83.zip
git-10881f076e19fbd0fa7b753b7c6c8203b419be83.tar.gz
git-10881f076e19fbd0fa7b753b7c6c8203b419be83.tar.bz2
Merge branch 'sb/pack-protocol-doc-nak'
A doc update. * sb/pack-protocol-doc-nak: Documentation: pack-protocol correct NAK response
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/pack-protocol.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 7a2ed30..736f389 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -307,7 +307,7 @@ In multi_ack mode:
ready to make a packfile, it will blindly ACK all 'have' obj-ids
back to the client.
- * the server will then send a 'NACK' and then wait for another response
+ * the server will then send a 'NAK' and then wait for another response
from the client - either a 'done' or another list of 'have' lines.
In multi_ack_detailed mode: