GIT repo with trunk code

This page provides documentation for the successful usage of Scribus Git repositories for Scribus development.
After this set of commands you will have your own branch in local folder and in scribus.git repository but based on current trunk.git repository image.

Initialisation of local GIT repo:

#git init

Add scribus.git as remote repo:

#git remote add -f origin git@scribus.net:scribus.git

Creating local branch:

#git branch --track my_branch origin/master
#git checkout my_branch

Add trunk.git as second remote repo:

#git remote add -f -m master trunk git://scribus.net/trunk.git

Pull from trunk:

#git pull trunk HEAD

After any local changes and committing push them to remote branch:

#git push my_branch origin

You should pull changes from trunk often to keep your repo in sync. Be careful to not push your changes to repos which are not in sync with trunk and available for others for push (eg. origin/master).