Peter Vereshagin <peter@xxxxxxxxxxxxxx> writes: > $ rm -r pathdir > $ git checkout branch00 pathdir > $ find pathdir/ > pathdir/ > pathdir/file00.txt > pathdir/file01.txt > $ Hasn't this been fixed at 0a1283b (checkout $tree $path: do not clobber local changes in $path not in $tree, 2011-09-30)? Are you using 1.7.7.1 or newer? If not, please upgrade. -- 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