Skip to content

Commit 21da426

Browse files
nelhagegitster
authored andcommitted
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>
1 parent b39c361 commit 21da426

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Documentation/git-pack-objects.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,13 @@ base-name::
119119
standard input.
120120

121121
--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
123123
even if it appears in the standard input.
124124

125125
--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.
130129

131130
--non-empty::
132131
Only create a packed archive if it would contain at

0 commit comments

Comments
 (0)