Code

More permissive "git-rm --cached" behavior without -f.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Fri, 13 Jul 2007 17:41:38 +0000 (19:41 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Jul 2007 06:52:46 +0000 (23:52 -0700)
commitbdecd9d41b3528e17aea2290344c584412e2424e
treee452049ca2a9cd38462831f73ea7a19fdff760e0
parent1701872fc2cfc48c740175848c1ef6fc10eb0e10
More permissive "git-rm --cached" behavior without -f.

In the previous behavior, "git-rm --cached" (without -f) had the same
restriction as "git-rm". This forced the user to use the -f flag in
situations which weren't actually dangerous, like:

$ git add foo           # oops, I didn't want this
$ git rm --cached foo   # back to initial situation

Previously, the index had to match the file *and* the HEAD. With
--cached, the index must now match the file *or* the HEAD. The behavior
without --cached is unchanged, but provides better error messages.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rm.txt
builtin-rm.c
t/t3600-rm.sh