summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2015-05-17 06:56:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-17 18:25:00 (GMT)
commit3890dae97014c2d8da06e26c0e43f12284ac3bdc (patch)
treea1b35ca09be1060b9579e874d2b15967a1ee5ca7
parent466739195864bf65bf2ca33a6e5637ae40a420fa (diff)
downloadgit-3890dae97014c2d8da06e26c0e43f12284ac3bdc.zip
git-3890dae97014c2d8da06e26c0e43f12284ac3bdc.tar.gz
git-3890dae97014c2d8da06e26c0e43f12284ac3bdc.tar.bz2
pack-protocol.txt: fix insconsistent spelling of "packfile"
Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/technical/pack-protocol.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index 462e206..812d857 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -502,11 +502,11 @@ MUST NOT send a push-cert command. When a push-cert command is
sent, command-list MUST NOT be sent; the commands recorded in the
push certificate is used instead.
-The pack-file MUST NOT be sent if the only command used is 'delete'.
+The packfile MUST NOT be sent if the only command used is 'delete'.
-A pack-file MUST be sent if either create or update command is used,
+A packfile MUST be sent if either create or update command is used,
even if the server already has all the necessary objects. In this
-case the client MUST send an empty pack-file. The only time this
+case the client MUST send an empty packfile. The only time this
is likely to happen is if the client is creating
a new branch or a tag that points to an existing obj-id.