Skip to content

Commit e4b4e7d

Browse files
committed
Merge branch 'ps/doc-packfile-vs-pack-file'
Doc consistency updates. * ps/doc-packfile-vs-pack-file: doc: fix inconsistent spelling of "packfile" pack-protocol.txt: fix insconsistent spelling of "packfile" git-unpack-objects.txt: fix inconsistent spelling of "packfile" git-verify-pack.txt: fix inconsistent spelling of "packfile"
2 parents ce6ab23 + bbf431c commit e4b4e7d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Documentation/git-unpack-objects.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ git-unpack-objects - Unpack objects from a packed archive
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file>
12+
'git unpack-objects' [-n] [-q] [-r] [--strict] < <packfile>
1313

1414

1515
DESCRIPTION
@@ -19,8 +19,8 @@ the objects contained within and writing them into the repository in
1919
"loose" (one object per file) format.
2020

2121
Objects that already exist in the repository will *not* be unpacked
22-
from the pack-file. Therefore, nothing will be unpacked if you use
23-
this command on a pack-file that exists within the target repository.
22+
from the packfile. Therefore, nothing will be unpacked if you use
23+
this command on a packfile that exists within the target repository.
2424

2525
See linkgit:git-repack[1] for options to generate
2626
new packs and replace existing ones.

Documentation/git-verify-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ OUTPUT FORMAT
4040
-------------
4141
When specifying the -v option the format used is:
4242

43-
SHA-1 type size size-in-pack-file offset-in-packfile
43+
SHA-1 type size size-in-packfile offset-in-packfile
4444

4545
for objects that are not deltified in the pack, and
4646

Documentation/technical/pack-protocol.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ contain all the objects that the server will need to complete the new
465465
references.
466466

467467
----
468-
update-request = *shallow ( command-list | push-cert ) [pack-file]
468+
update-request = *shallow ( command-list | push-cert ) [packfile]
469469

470470
shallow = PKT-LINE("shallow" SP obj-id LF)
471471

@@ -491,7 +491,7 @@ references.
491491
*PKT-LINE(gpg-signature-lines LF)
492492
PKT-LINE("push-cert-end" LF)
493493

494-
pack-file = "PACK" 28*(OCTET)
494+
packfile = "PACK" 28*(OCTET)
495495
----
496496

497497
If the receiving end does not support delete-refs, the sending end MUST
@@ -502,11 +502,11 @@ MUST NOT send a push-cert command. When a push-cert command is
502502
sent, command-list MUST NOT be sent; the commands recorded in the
503503
push certificate is used instead.
504504

505-
The pack-file MUST NOT be sent if the only command used is 'delete'.
505+
The packfile MUST NOT be sent if the only command used is 'delete'.
506506

507-
A pack-file MUST be sent if either create or update command is used,
507+
A packfile MUST be sent if either create or update command is used,
508508
even if the server already has all the necessary objects. In this
509-
case the client MUST send an empty pack-file. The only time this
509+
case the client MUST send an empty packfile. The only time this
510510
is likely to happen is if the client is creating
511511
a new branch or a tag that points to an existing obj-id.
512512

0 commit comments

Comments
 (0)