Yann Dirson <ydirson@xxxxxxxxxx> writes: > That is, "git rm" will only ever remove the file without asking, when > it is safe do so, in that you can retrieve your file from history. Or > do you think of another way, in which more safety would be needed ? Defaulting to --cached would be an obvious way to avoid data-loss. _At least_, mentionning --cached in the error message in case of staged changes would be a considerable step forward. At the moment, the non-expert user will have difficulties to unversion the file without deleting it. I just see it as $ git rm foo error: 'foo' has changes staged in the index (hint: to hang yourself, try -f) $ _ -- Matthieu - 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