<pet_peeve>
On Mon, Dec 04, 2006 at 07:42:26AM -0800, Linus Torvalds wrote:
(And obviously, for all the normal reasons, if the index or HEAD doesn't
match, the error message should be helpful and also explicitly mention the
"-f" flag. Somehing like
file 'x' does not match HEAD or has been staged for changes.
Will not remove. Use '-f' to force removal.
And you wouldn't tell which, you stupid computer?
I hate when error messages go "there is a problem that may be x, y or
z. You can figure out which one yourself.".
Incidentally, splitting the message would allow you to add a "use git
diff x" or a "use git diff --cached x to see the differences" message.
</pet_peeve>