Arianne Source Code Repositories

The Arianne project currently uses CVS and Git to manage source code.

Projects using git

Stendhal has been migrated to git.

read-only access: git://git.code.sf.net/p/arianne/stendhal

read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/stendhal

Web-based repository viewer: https://sourceforge.net/p/arianne/stendhal/ci/master/tree/

Marauroa has been migrated to git.

read-only access: git://git.code.sf.net/p/arianne/marauroa

read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marauroa

Web-based repository viewer: https://sourceforge.net/p/arianne/marauroa/ci/master/tree/

Marboard has been migrated to git.

read-only access: git://git.code.sf.net/p/arianne/marboard

read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marboard

Web-based repository viewer: https://sourceforge.net/p/arianne/marboard/ci/master/tree/

Example .git/config for developers

Note: Do not put project specific settings into your .gitconfig file in your home folder but use the config file in the .git folder of the individual projects for those.

[core]
        repositoryformatversion = 0
        filemode = true
        logallrefupdates = true
        autocrlf = false
[branch "master"]
         remote = origin
        merge = refs/heads/master
[remote "origin"]
        url = ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[user]
        name = USERNAME
        email = USERNAME@users.sourceforge.net

Please make sure, that you use the long form of your Sourceforge email address.

Terms used in git

HEAD

refers to the currently checked out workspace.

master

refers to the commited changes (that is HEAD in CVS)

origin/master

refers to committed changes that have been pushed to Sourceforge.

"commit"

is only local, after a local commit one has to "push" the changes to Sourceforge.

• updating is done by first "fetching" the changes from Sourceforge and then "merging" them.
• on the command line git pull does both, use "Merge" or "Rebase" in Eclipse.
• some of the dialog are very complicated on first glance.

Eclipse Git User Guide