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>
Nelson Elhage committed
Feb 18, 2010 at 22:29 UTC
21da42621489df7824f1fce7180702a9aa540707
1 file changed
+4
-5
Documentation/git-pack-objects.txt
+4
-5
@@ -119,14 +119,13 @@ base-name::
119
standard input.
120
121
--incremental::
122
- This flag causes an object already in a pack ignored
122
+ This flag causes an object already in a pack to be ignored
123
even if it appears in the standard input.
124
125
--local::
126
- This flag is similar to `--incremental`; instead of
127
- ignoring all packed objects, it only ignores objects
128
- that are packed and/or not in the local object store
129
- (i.e. borrowed from an alternate).
126
+ This flag causes an object that is borrowed from an alternate
127
+ object store to be ignored even if it appears in the standard
128
+ input.
129
130
--non-empty::
131
Only create a packed archive if it would contain at