Ted Dunning Wed, 04 Sep 2013 10:36:19 -0700
I have to say I love git. I did a git stash before git pull and then popped the stash and my changes appeared correctly in the moved files.
Totally painless.