Question

I work at a company which uses Git for our version control. We’re using a hosted repo service (Beanstalk) as our internal “public” (by that I mean accessible to the whole dev team) repo. I have two computers that I normally work on for writing code. I like using some of the history rewriting features of Git, specifically rebasing and amending commits, but I really don’t like using them after I’ve pushed something to a published branch. Yet, I need to be able to share code between these two computers, and preferably no one else.

What I’d like is an easy way to share my code between the two computers, without having to share it with everyone else. I have considered Airdrop (both computers are Macs), and ssh. What would be the suggested way of achieving this, while taking advantage of git’s distributed nature?

Answer 1

You can push, fetch and pull between the machines freely assuming you have ssh access between them:

git push computer2:projects/prog HEAD:tmp

or, if you are on computer2:

git pull computer1:projects/prog HEAD

or

git fetch computer1:prj/prog branch1:t1
git fetch computer1:prj/prog branch2:t2
git merge t1 t2

or

git fetch computer1:prj/prog branch1 branch2 branch3
git merge FETCH_HEAD

and so on… See git help fetch for more examples.