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.
On Sat, May 3, 2008 at 3:08 AM, Tim Harper <timcharper@gmail.com> wrote:
Show 19 quoted lines
> ---
> 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.1Yes, "needs update" is definitely cryptic and confusing.