aboutsummaryrefslogtreecommitdiff
path: root/git-quiltimport.sh
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2007-07-13 19:41:38 +0200
committerJunio C Hamano <gitster@pobox.com>2007-07-13 23:52:46 -0700
commitbdecd9d41b3528e17aea2290344c584412e2424e (patch)
treee452049ca2a9cd38462831f73ea7a19fdff760e0 /git-quiltimport.sh
parent1701872fc2cfc48c740175848c1ef6fc10eb0e10 (diff)
downloadgit-bdecd9d41b3528e17aea2290344c584412e2424e.tar.gz
git-bdecd9d41b3528e17aea2290344c584412e2424e.tar.xz
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>
Diffstat (limited to 'git-quiltimport.sh')
0 files changed, 0 insertions, 0 deletions