On Fri, Jun 22, 2012 at 8:31 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > Files mentioned in .gitignore are considered garbage. But your file is > precious, hence, you should not list it in .gitignore. An important distinction! Thanks for the thread pointer. The --no-overwrite-ignore flag is part of what I want. It at least gives protection against accidentally losing things (on Wednesday, I unwittingly disposed of several large binary files, and didn't even know about it until a chance discovery of directory size). Is there a way to specify that this flag always be used, even when the checkout doesn't happen on the command line but through (eg) git bisect? Chris Angelico -- 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