title: Reconciling changes made outside a git repository
body: <p>I have cloned a git repo into <code>/tmp</code> on my server. I then proceeded to copy the contents of the git repo to <code>/var/my-site</code> without actually copying the <code>.git</code> file itself. This was several weeks back. I have made several changes to the <code>/var/my-site</code> directory without worrying about the <code>.git</code> folder not being moved when I made the initial install to <code>/var/my-site</code>. </p>
  
  <p>Weeks later, the remote git repo has been updated with new features that I would like to take advantage of without losing weeks of my work. Is there any way that I can update the source code of <code>/var/my-site</code> without having to meticulously edit each file with the new features, drag and drop, cut and paste, etc. and still maintain my previous work? </p>
  
  <p>Will just moving the <code>.git</code> folder from <code>/tmp</code> to <code>/var/my-site</code> work, or is this not as easy as I'm thinking?</p>