On 15 May 2013, at 15:32, Johannes Sixt wrote: > Am 5/15/2013 10:40, schrieb Luc Bourhis: >> I work on a case insensitive filesystem and I have core.ignorecase set to true. >> ... >> So I thought it was a job for git filter-branch, ... >> >> However because of those two blobs, I have: >> >> ~> git status >> # modified: .../fourCircles.py >> >> and git filter-branch therefore refuses to run. > > Make a commit that has neither file, run git filter-branch, then throw > away the commit with git reset --hard HEAD~. That did not work, i.e. fourCircles remained "unmodified". Eventually, I managed by successively removing the file with "C" and then the file with "c". Then filter-branch, and then reset --hard as you suggested. Then of course, all the sha's have changed and git cvsimport can't be used for incremental updates anymore, which I knew would happen, obviously. Thanks, Luc J. Bourhis -- 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