Skip to content

Commit

Permalink
Documentation: pack-objects: Clarify --local's semantics.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nelson Elhage authored and Junio C Hamano committed Feb 20, 2010
1 parent b39c361 commit 21da426
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Documentation/git-pack-objects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 21da426

Please sign in to comment.