Great, I have gotten the concept now :) My workaround for my problem is to rename the file to ....default and then all will work out well :) Copy the file then and locally modify it, but it will be in .gitignore so not tracked :) On Sat, May 18, 2013 at 11:01 PM, Johannes Sixt <j6t@xxxxxxxx> wrote: > Am 18.05.2013 20:55, schrieb John Keeping: >> On Sat, May 18, 2013 at 08:43:57PM +0200, Peter Lauri wrote: >>> But I just don't want to see that darn file. It is a config file that >>> I have changed, and I don't want to need to stash it for each "git >>> svn" action I want to perform... Any solution for that? >> >> Read about --assume-unchanged in git-update-index(1). > > Beware!! --assume-unchanged is a promise not to modify a file, but that > is not true in this case, because it *was* modified. It might hide the > file from the git-status output, but then git might do something > unexpected sometimes, because a promise was not kept. > > See last paragraph of > http://article.gmane.org/gmane.comp.version-control.git/146353 > > -- Hannes > -- 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