git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [WIP PATCH 2/6] unpack-trees: typofix
Date: Sat, 19 Sep 2009 22:06:11 -0700	[thread overview]
Message-ID: <1253423175-6339-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1253423175-6339-1-git-send-email-gitster@pobox.com>

I am not good at subject-verb concordance.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 unpack-trees.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index 720f7a1..d174fe0 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -617,7 +617,7 @@ static int verify_absent(struct cache_entry *ce, const char *action,
 			 * found "foo/." in the working tree.
 			 * This is tricky -- if we have modified
 			 * files that are in "foo/" we would lose
-			 * it.
+			 * them.
 			 */
 			ret = verify_clean_subdirectory(ce, action, o);
 			if (ret < 0)
-- 
1.6.5.rc1.90.ga3b1b

  parent reply	other threads:[~2009-09-20  5:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-20  5:06 [WIP PATCH 0/6] Merging with D/F conflicts Junio C Hamano
2009-09-20  5:06 ` [WIP PATCH 1/6] diff-lib.c: fix misleading comments on oneway_diff() Junio C Hamano
2009-09-20  5:06 ` Junio C Hamano [this message]
2009-09-20  5:06 ` [WIP PATCH 3/6] unpack_callback(): use unpack_failed() consistently Junio C Hamano
2009-09-20  5:06 ` [WIP PATCH 4/6] traverse_trees(): handle D/F conflict case sanely Junio C Hamano
2009-09-20  5:06 ` [WIP PATCH 5/6] unpack-trees.c: prepare for looking ahead in the index Junio C Hamano
2009-09-20  5:06 ` [WIP PATCH 6/6] read-tree --debug-unpack 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=1253423175-6339-3-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /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).