From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: On removing files and "git-rm is pointless"
Date: Mon, 04 Dec 2006 17:03:07 +0100 [thread overview]
Message-ID: <el1go7$2ro$1@sea.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.64.0612040737120.3476@woody.osdl.org
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.
>
> ("has been staged for changes" is just a long way of saying "index". See?
> I _can_ learn.)
I'd rather have
File 'x' does not match HEAD or index (has been staged for changes).
Will not remove. Use "git rm -f 'x'" to force removal.
I'd rather not learn that "staged for changes" mean "index". I'm quote
comfortable with the concept of "index" and the name "index",
thankyouverymuch.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-04 16:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-02 17:05 On removing files and "git-rm is pointless" Carl Worth
2006-12-02 17:37 ` Linus Torvalds
2006-12-02 20:00 ` Sam Vilain
2006-12-03 3:50 ` Nicolas Pitre
2006-12-04 10:13 ` Junio C Hamano
2006-12-04 10:48 ` Jakub Narebski
2006-12-04 15:42 ` Linus Torvalds
2006-12-04 16:03 ` Jakub Narebski [this message]
2006-12-04 16:04 ` Olivier Galibert
2006-12-05 1:08 ` Junio C Hamano
2006-12-05 3:29 ` Nicolas Pitre
2006-12-05 3:44 ` Carl Worth
2006-12-05 5:43 ` Junio C Hamano
2006-12-02 20:59 ` Horst H. von Brand
2006-12-02 21:10 ` Sam Vilain
2006-12-02 21:33 ` Linus Torvalds
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='el1go7$2ro$1@sea.gmane.org' \
--to=jnareb@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).