git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nelson Elhage <nelhage@MIT.EDU>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Nelson Elhage <nelhage@mit.edu>
Subject: [PATCH resend] Documentation: pack-objects: Clarify --local's semantics.
Date: Thu, 18 Feb 2010 22:29:30 -0500	[thread overview]
Message-ID: <1266550170-17013-1-git-send-email-nelhage@mit.edu> (raw)

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>
---
 This is an unmodified resend of a patch I sent about a month ago
 which received no response.

 Documentation/git-pack-objects.txt |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index f54d433..d8e5686 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -117,14 +117,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
-- 
1.6.6.30.g1e6fd

             reply	other threads:[~2010-02-19  3:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-19  3:29 Nelson Elhage [this message]
2010-02-19  5:44 ` [PATCH resend] Documentation: pack-objects: Clarify --local's semantics Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266550170-17013-1-git-send-email-nelhage@mit.edu \
    --to=nelhage@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).