summaryrefslogtreecommitdiff
path: root/Documentation/git-pack-objects.txt
diff options
context:
space:
mode:
authorNelson Elhage <nelhage@MIT.EDU>2010-02-18 22:29:30 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-20 09:24:19 -0800
commit21da42621489df7824f1fce7180702a9aa540707 (patch)
tree57369872d84cc041cc6d2c7066e64410588a0492 /Documentation/git-pack-objects.txt
parentb39c3612eb443e77bd04d645578e1155988c6dde (diff)
downloadgit-21da42621489df7824f1fce7180702a9aa540707.tar.gz
Documentation: pack-objects: Clarify --local's semantics.
The current documentation suggests that --local also ignores any objects in local packs, which is incorrect. Change the language to be clearer and more parallel to the other options that ignore objects. While we're at it, fix a trivial error in --incremental's documentation. Signed-off-by: Nelson Elhage <nelhage@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pack-objects.txt')
-rw-r--r--Documentation/git-pack-objects.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 034caedc39..769f1de6b6 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -119,14 +119,13 @@ base-name::
standard input.
--incremental::
- This flag causes an object already in a pack ignored
+ This flag causes an object already in a pack to be ignored
even if it appears in the standard input.
--local::
- This flag is similar to `--incremental`; instead of
- ignoring all packed objects, it only ignores objects
- that are packed and/or not in the local object store
- (i.e. borrowed from an alternate).
+ This flag causes an object that is borrowed from an alternate
+ object store to be ignored even if it appears in the standard
+ input.
--non-empty::
Only create a packed archive if it would contain at