On 3/11/13, Max Horn <max@xxxxxxxxx> wrote: > Looking at the git config man page to check what each of my config settings > does, I discovered "trustctime". And adding > trustctime = false > to .git/config made the rebase work, every single time. Huh. > > > Adding this to the fact that a clone works fine, I wonder if something *is* > touching my files, but just in that directory. But what could it be? One > nagging suspicion is the "file versioning" feature Apple introduced as part > of Time Machine in OS X 10.7; it's kind of a "version control system for > n00bs" for arbitrary documents. It has caused me some pain in the past. > > But I just re-checked, and problematic repos is explicitly on the Time > Machine exclusion list. I also used the "tmutil isexcluded FILES" to verify > that the problematic files are really on the TM exclusion list. Finally, I > moved the one of the repos subdirectory containing most of the problematic > files, and then run "git checkout". In other instances, this sufficed to > "disassociate" a file from an unwanted TM version history. But doing that > had no effect here, i.e. also with the freshly regenerated files, the > problems appear. Would you be able to turn off Time Machine completely and do a few tests? If it does works, then it becomes a matter of fixing Time Machine... -- 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