From: Matt Graham Date: Sat, 03 May 2008 15:24:02 GMT Subject: Re: [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. Message-ID: <1c5969370805030824h3ecdb967ub0c57f6fc9cbba58@mail.gmail.com> In-Reply-To: <1209798522-13618-1-git-send-email-timcharper@gmail.com> On Sat, May 3, 2008 at 3:08 AM, Tim Harper wrote: > --- > 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 Yes, "needs update" is definitely cryptic and confusing.