On Mon, Nov 21, 2011 at 10:18 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > In the medium term, I think one reasonable way forward solving the "TODO > that used to be tracked but now untracked and ignored" issue is to > introduce "info/exclude-override" that comes between command line and > in-tree patterns. The info/exclude file is designed as the fallback > definition to be used when all other sources are too lax, and comes near > the precedence stack; the "TODO" situation however calls for an override > that is stronger than the in-tree patterns. Short term, should we allow an option to disregard ignored status (i.e. all files are precious)? Something like [2/2] [1/2] checkout,merge: loosen overwriting untracked file check based on info/exclude [2/2] checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore -- Duy -- 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