GIT repo with trunk code: Difference between revisions

From Scribus Wiki
Jump to navigation Jump to search
No edit summary
No edit summary
Line 13: Line 13:
#git checkout my_branch
#git checkout my_branch
</source>
</source>
Add trunk.git as fetch/pull source:
Add trunk.git as second remote repo:
<source lang="bash">#git remote add trunk --mirror=fetch git://scribus.net/trunk.git</source>
<source lang="bash">#git remote add -f -m master trunk git://scribus.net/trunk.git</source>
Pull from trunk:
Pull from trunk:
<source lang="bash">#git pull trunk HEAD</source>
<source lang="bash">#git pull trunk HEAD</source>

Revision as of 12:06, 19 June 2012


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).