Matthieu Moy wrote: > 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. Sensible. There might be some discussion if what git-rm without --cached does is right, but that is besides scope of this patch. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html