> By "committed", I assume you meat that you have "dirA/unco" as an > untracked file, and "dirA/committed" as a file in the index? Of course, > Thanks for putting this together. I agree with the expected output in > each case, and I think this covers the cases we have seen (case 1 is > Michael's original report, case 2 is what I wrote in my mail, and case 3 > is the one you just came up with). I can't think offhand of any others. Great, so I can build some tests reflecting those behaviors while waiting more inputs -- 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