Question

I have an unfortunate situation. I’m using Git 1.7.9 on Windows 7. I have a repo that lives in foo\bar. Everything is great. However, I just realized that the project requires files that live in foo. What is the best way to add them to the repo without messing everything up? (I’m new to git. I’m using the Github for Windows client, for what it’s worth)

Answer 1

A clever answer by Abhishek Anand:

Move the .git directory (and any other support files, like .gitignore) to the parent directory. Then, from the parent directory, add the old repository root; git detects the rename and handles it correctly. So, in your example,

foo\bar> move .git ..
foo\bar> cd ..
foo> git add bar
foo> git commit -a
foo> git add .
foo> git commit