diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:47 -0700 |
| commit | 593be730f21a10b14368464180d1e6f3402b8c4a (patch) | |
| tree | c0d31ce46b5df75921da07bca4d6827b6c0e1cf1 | |
| parent | f7b01d3eb76b5c1d04b774454364e87b49e80b56 (diff) | |
| parent | 280abfd4f5055922e8abcbb988fa0a8df0eef128 (diff) | |
| download | git-593be730f21a10b14368464180d1e6f3402b8c4a.tar.gz | |
Merge branch 'sb/pack-protocol-doc-nak' into maint
A doc update.
* sb/pack-protocol-doc-nak:
Documentation: pack-protocol correct NAK response
| -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 8b36343802..d40ab65496 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: |