summaryrefslogtreecommitdiff
path: root/Documentation/git-pack-objects.txt
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2008-11-09 23:59:58 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 10:29:22 -0800
commitdaae06259556246959963947752bde4ee2df7b44 (patch)
tree173b309e6b071943447b676b9d0d7bd218b0bbf6 /Documentation/git-pack-objects.txt
parentsha1_file.c: split has_loose_object() into local and non-local counterparts (diff)
downloadtgif-daae06259556246959963947752bde4ee2df7b44.tar.xz
pack-objects: extend --local to mean ignore non-local loose objects too
With this patch, --local means pack only local objects that are not already packed. Additionally, this fixes t7700 testing whether loose objects in an alternate object database are repacked. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pack-objects.txt')
-rw-r--r--Documentation/git-pack-objects.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index f9fac2ccf9..7d4c1a7556 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -121,7 +121,7 @@ base-name::
--local::
This flag is similar to `--incremental`; instead of
ignoring all packed objects, it only ignores objects
- that are packed and not in the local object store
+ that are packed and/or not in the local object store
(i.e. borrowed from an alternate).
--non-empty::