lineups with GIT

I am trying to set up two different line-ups for a project (development and testing).

The development line-up is the master, and test line-up pulls data from it. The code is the same in both. But since the line-ups are served from two different domains one folder in the development line-up is called iWeb.local, and in the test line-up it is called iWeb.test. That is the only difference between the two.

I tried using "git mv" command and it somewhat solved the problem. After I cloned the devel line-up, I used "git rm iWeb.local iWeb.test". And now if I edit a file in iWeb.local and do a pull to iWeb.test this file gets properly updated while preserving the difference between the folder names. But if I add a new file to iWeb.local, and then do a pull I get iWeb.local folder added together with the new file to the testing line-up.

I was wondering if it is intended behaviour for GIT. And if it is may be someone can point me to a better way to setup two line-ups using GIT.

Thanks