Re: [PATCH 01/10] Better "Changed but not updated" message in git-status

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 23, 2010, 18:13 UTC
Message-ID: <20101023181350.GA21040@burratino>
In-Reply-To: <1287851481-27952-2-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy wrote:

Show 9 quoted lines

> --- a/Documentation/gittutorial-2.txt
> +++ b/Documentation/gittutorial-2.txt
> @@ -373,7 +373,7 @@ $ git status
>  #
>  #       new file: closing.txt
>  #
> -# Changed but not updated:
> +# Changed but not staged for commit:
>  #   (use "git add <file>..." to update what will be committed)

I find this even more confusing, though I admit that may be due to habit more than anything else.

My reading, before:

	These files were changed, but the version to be committed has
	not been updated to include the latest changes (use "git add
	<file>..." to add these changes to the index).

Afterwards:

	These files were changed, but they are not staged for the
	next commit.

If I do

	echo hello >hi.c
	git add hi.c
	echo world >>hi.c
	git status

then what does it mean to say "hi.c" is not staged for commit? It actually does have changes ready for committing.

I would prefer to say something to the effect of

	# Has unstaged changes:

Anyone wordsmiths out there with ideas to make this clearer?