WARNING: Not yet reviewed, could have bugs! "git <command> --help" to be sure.
== How to work with git ==
Create your own repository in a public git server:
* Go to ~/public_html/git
* Create a clone of the official archive: git clone --bare git://git.collabora.co.uk/git/empathy.git
* Edit description file and write a description of your repos
Create your working repository on your laptop:
* On your laptop: git clone git://git.collabora.co.uk/git/empathy.git
* Add a remote location for your public clone, for example: git remote add mypublicrepos git+ssh://git.collabora.co.uk/git/user/<user>/empathy.git
* You can add a remote location for branches of other people. To get xclaesse branches of emapthy: git remote add xclaesse git://git.collabora.co.uk/git/user/xclaesse/empathy.git
* To update the code from all your remote locations: git remote update
* Now you can see all branches using git branch -a
You want to fix a bug from the "boken" branch in "xclaesse"'s repository?
* git checkout -b myfixbranch xclaesse/broken
* fix the bug
* git commit -a
* git push mypublicrepos myfixbranch
* go to IRC/bugzilla and tell him to pull your branch
* The bug is now fixed you can remove your branch: git branch -D myfixbranch
Other things:
* If there is new code on official repos, update your clone: git pull
* If you have a myfix branch that needs to be updated with the new code in master: git checkout myfix && git merge master
* xclaesse removed a branch from his public repos, to remove that branch from your clone: git remote prune xclaesse