git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nelson Elhage <nelhage@MIT.EDU>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nicolas Pitre <nico@fluxnic.net>,
	git@vger.kernel.org, Nelson Elhage <nelhage@mit.edu>
Subject: Re: What's cooking in git.git (Feb 2010, #06; Tue, 23)
Date: Wed, 24 Feb 2010 19:11:23 -0500	[thread overview]
Message-ID: <1267056683-6697-1-git-send-email-nelhage@mit.edu> (raw)
In-Reply-To: <7v635m6w0r.fsf@alter.siamese.dyndns.org>

You should probably fix --honor-pack-keep while you're at it.

(I assume this should probably get squashed into your patch, but I'm
sending it as another patch, because I'm unsure of the etiquette on
resending an edited version of someone else's patch)

- Nelson

---- >8 ----
Subject: pack-objects documentation: Fix --honor-pack-keep as well.

Signed-off-by: Nelson Elhage <nelhage@mit.edu>
---
 Documentation/git-pack-objects.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 1deaa65..8ed09c0 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -115,8 +115,8 @@ base-name::
 
 --honor-pack-keep::
 	This flag causes an object already in a local pack that
-	has a .keep file to be ignored, even if it appears in the
-	standard input.
+	has a .keep file to be ignored, even if it it would have
+	otherwise been packed.
 
 --incremental::
 	This flag causes an object already in a pack to be ignored
-- 
1.6.6.30.g1e6fd

  reply	other threads:[~2010-02-25  0:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-24  1:20 What's cooking in git.git (Feb 2010, #06; Tue, 23) Junio C Hamano
2010-02-24  2:06 ` Tay Ray Chuan
2010-02-24  6:28 ` Jeff King
2010-02-24 15:09 ` Nicolas Pitre
2010-02-24 23:42   ` Junio C Hamano
2010-02-25  0:11     ` Nelson Elhage [this message]
2010-02-25 21:39 ` Sverre Rabbelier

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=1267056683-6697-1-git-send-email-nelhage@mit.edu \
    --to=nelhage@mit.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nico@fluxnic.net \
    /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).