git workflow question |
2009-03-30
|
I'm trying to integrate git into my workflow. I've been reading documentation and tutorials (there sure are a lot), but I'm not sure they cover the use case I want to try and implement. So I'm explaining it here in the hopes that some experienced gits will be able to show me the way.
The basic use case is simple: I want to hack on GStreamer, which uses git, from various computers (laptop, work machine, home machine), and have my private and/or public hacking in sync between those three machines.
Basically, when I create a branch on my laptop, hack in it, commit stuff, and push it out to my private or public repo, I then want to pull all those changes on my home desktop and continue hacking.
It looks like I should be able to do it with a magic combination of a bare repository on some server, and the right incantation of git remote add lines on all of my machines. But so far, my experiments have only led me to some abomination of a bare repository where my home machine sees a branch created on my laptop with the name 'thomas' as a branch named 'private/thomas'. In other words, the names don't match up. And for now it looks like the content doesn't match up either; I somehow merged the thomas branch into my master on my home desktop. Also, it looks like pulls from that private bare repo end up as an actual commit, which seems a bit messy.
I'll retry my experiment to see if I might have screwed something up, but in the meantime, if you recognize the use case I'm going for and know how to implement it, feel free to throw me a bone.