Contribution

From JopWiki

Jump to: navigation, search

Before sending a patch download the latest version can be obtained from with following Git command:

git clone git://www.soc.tuwien.ac.at/jop.git

If working already with the git repository of JOP a simple

git pull

will update your working copy to the latest, greatest version of JOP.


Commit local changes with:

git commit -a -m "Your message here"

Generate a git patch (a seperate patch file for each commit) with:

git format-patch origin

Patch is applied with

git am < 0001-Example.patch

[edit] Remote Branches

To track locally a remote branch use following example:

git branch datacache origin/datacache

To get rid of a local tracking from a (deleted?) remote branch:

git branch -rd origin/splitcaches

To create a remote branch from a local branch, <remote-name> is usually origin

git push <remote-name> <branch-name>

[edit] Git and OC SVN sync

To get a git version of the SVN:

git svn clone -s http://opencores.org/ocsvn/jop/jop jop

merge changes with

git pull ~/jop

and commit back into the SVN with

git svn dcommit
Personal tools