summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2016-07-22 13:28:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-22 13:31:55 -0700
commit280abfd4f5055922e8abcbb988fa0a8df0eef128 (patch)
tree650549f25b3b3d1a800d9389127519996bbde19b /Documentation/git-mergetool--lib.txt
parentGit 2.4.11 (diff)
downloadtgif-280abfd4f5055922e8abcbb988fa0a8df0eef128.tar.xz
Documentation: pack-protocol correct NAK response
In the transport protocol we use NAK to signal the non existence of a common base, so fix the documentation. This helps readers of the document, as they don't have to wonder about the difference between NAK and NACK. As NACK is used in git archive and upload-archive, this is easy to get wrong. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions