Maybe the title didn't exactly convey my problem, but a little explanation will be enough. I have this situation where I'm developing a website with another friend, and we're using Git to manage the versioning of the code, etc.

Problem is, at home (for both of us) is all good, we sync, then we submit changes and commit. But at work (and we work at the same company) our firewall blocks Git and sometimes we are able to get something done here, but without being able to retrieve or push updates to Git, how do we keep everything synched withtout Git going crazy? 

After a few attempts at this, by simply copying everything to a pendrive and then try to sync it all at home, and screwing everything, finally managed something that "kinda works", which is by using xcopy with "newer files" only option. But even that sometimes messes things up.

Anyone ever come up a similar situation? Any ideas for me? Thanks.