On Sun, 3 Dec 2006, Sam Vilain wrote: > Linus Torvalds wrote: > > I'd like it more if it defaulted to actually removing the file, preferably > > refusing to with an error message if the file didn't match the index. > > index, or HEAD version? Otherwise you can "update-index"; "rm" without > seeing something wrong is happening. Well tough then. I think what Linus is proposing makes tons of sense. If you do git rm by mistake then you can always do git checkout on that file to get it back. If you modified it so it doesn't match the index then git rm won't do anything by default so you have a chance to think a bit more. If you updated the index, didn't commit anything but then do git rm then you certainly wanted to really rm the file. If not then just feel the pain of your stupidity and start again from the latest version. Nicolas - 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