git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tim Harper <timcharper@gmail.com>
To: git@vger.kernel.org
Cc: Tim Harper <timcharper@gmail.com>
Subject: [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update".  "file.txt: has changes" is much clearer.
Date: Sat,  3 May 2008 01:08:42 -0600	[thread overview]
Message-ID: <1209798522-13618-1-git-send-email-timcharper@gmail.com> (raw)

---
 read-cache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/read-cache.c b/read-cache.c
index a92b25b..971667d 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -999,7 +999,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
 			}
 			if (quiet)
 				continue;
-			printf("%s: needs update\n", ce->name);
+			printf("%s: has changes\n", ce->name);
 			has_errors = 1;
 			continue;
 		}
-- 
1.5.5.1

             reply	other threads:[~2008-05-03  7:09 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-03  7:08 Tim Harper [this message]
2008-05-03 14:09 ` [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer Johannes Schindelin
2008-05-03 16:19   ` Tim Harper
2008-05-03 16:57   ` Junio C Hamano
2008-05-03 20:10     ` Tim Harper
2008-05-04  0:08       ` Junio C Hamano
2008-05-04  0:21         ` Avery Pennarun
2008-05-04  1:24           ` Junio C Hamano
2008-05-05 16:35             ` Avery Pennarun
2008-05-05 17:05               ` Jeff King
2008-05-06 21:50               ` Tim Harper
2008-05-04  9:29     ` Johannes Schindelin
2008-05-03 15:24 ` Matt Graham

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=1209798522-13618-1-git-send-email-timcharper@gmail.com \
    --to=timcharper@gmail.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).