summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-24 15:41:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-24 15:41:27 -0800
commit3909f14f62fe81d65e62a2fe6b0e3a8c1661d422 (patch)
tree3fc2fcbeb137274065bc96a7406295e7cda8f8a3
parentDocumentation: pack-objects: Clarify --local's semantics. (diff)
downloadtgif-3909f14f62fe81d65e62a2fe6b0e3a8c1661d422.tar.xz
pack-objects documentation: reword "objects that appear in the standard input"
These were written back when we always read objects from the standard input. These days --revs and its friends can feed only the start and end points and have the command internally enumerate the objects. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-pack-objects.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 769f1de6b6..1deaa6501e 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -120,12 +120,12 @@ base-name::
--incremental::
This flag causes an object already in a pack to be ignored
- even if it appears in the standard input.
+ even if it would have otherwise been packed.
--local::
This flag causes an object that is borrowed from an alternate
- object store to be ignored even if it appears in the standard
- input.
+ object store to be ignored even if it would have otherwise been
+ packed.
--non-empty::
Only create a packed archive if it would contain at