summaryrefslogtreecommitdiff
path: root/Documentation/git-unpack-objects.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:27 (GMT)
commite41f8d98e37643909e22317f2ffdd940b953af55 (patch)
treea533ed560bb97efa7ce1b28e88ab79411d074cc2 /Documentation/git-unpack-objects.txt
parent48feda5873deab617a368df0af4bc10a0731124c (diff)
parentbbf431c9ae291f670445ae6cbb15ae3a570c0d45 (diff)
downloadgit-e41f8d98e37643909e22317f2ffdd940b953af55.zip
git-e41f8d98e37643909e22317f2ffdd940b953af55.tar.gz
git-e41f8d98e37643909e22317f2ffdd940b953af55.tar.bz2
Merge branch 'ps/doc-packfile-vs-pack-file' into maint
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"
Diffstat (limited to 'Documentation/git-unpack-objects.txt')
-rw-r--r--Documentation/git-unpack-objects.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index 12cb108..07d4329 100644
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -9,7 +9,7 @@ git-unpack-objects - Unpack objects from a packed archive
SYNOPSIS
--------
[verse]
-'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file>
+'git unpack-objects' [-n] [-q] [-r] [--strict] < <packfile>
DESCRIPTION
@@ -19,8 +19,8 @@ the objects contained within and writing them into the repository in
"loose" (one object per file) format.
Objects that already exist in the repository will *not* be unpacked
-from the pack-file. Therefore, nothing will be unpacked if you use
-this command on a pack-file that exists within the target repository.
+from the packfile. Therefore, nothing will be unpacked if you use
+this command on a packfile that exists within the target repository.
See linkgit:git-repack[1] for options to generate
new packs and replace existing ones.