Arianne Source Code Repositories: Difference between revisions
Jump to navigation
Jump to search
Content deleted Content added
imported>Hendrik Brummermann No edit summary |
imported>Hendrik Brummermann No edit summary |
||
| Line 1: | Line 1: | ||
The Arianne project currently uses |
The Arianne project currently uses Git to manage source code. |
||
| ⚫ | |||
'''Stendhal''' |
|||
| ⚫ | |||
| ⚫ | |||
| ⚫ | |||
| ⚫ | |||
'''Marauroa''' |
|||
'''Stendhal''' has been migrated to git. |
|||
: read-only access: |
: read-only access: https://codeberg.org/arianne/marauroa.git |
||
: read/write access for developers: ssh:// |
: read/write access for developers: ssh://git@codeberg.org/arianne/marauroa.git |
||
: Web-based repository viewer: https:// |
: Web-based repository viewer: https://codeberg.org/arianne/marauroa |
||
'''Marboard''' |
|||
'''Marauroa''' has been migrated to git. |
|||
| ⚫ | |||
| ⚫ | |||
| ⚫ | |||
'''Marboard''' has been migrated to git. |
|||
: read-only access: git://git.code.sf.net/p/arianne/marboard |
: 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 |
: read/write access for developers: ssh://USERNAME@git.code.sf.net/p/arianne/marboard |
||
| Line 37: | Line 35: | ||
merge = refs/heads/master |
merge = refs/heads/master |
||
[remote "origin"] |
[remote "origin"] |
||
url = ssh:// |
url = ssh://git@codeberg.org/arianne/stendhal.git |
||
fetch = +refs/heads/*:refs/remotes/origin/* |
fetch = +refs/heads/*:refs/remotes/origin/* |
||
[user] |
[user] |
||
name = |
name = REPLACE_WITH_FULL_NAME |
||
email = |
email = REPLACE_WITH_EMAIL_ADDRESS |
||
</pre> |
</pre> |
||
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. |
|||
[http://wiki.eclipse.org/EGit/User_Guide Eclipse Git User Guide] |
[http://wiki.eclipse.org/EGit/User_Guide Eclipse Git User Guide] |
||
Latest revision as of 18:32, 23 December 2025
The Arianne project currently uses Git to manage source code.
Projects
Stendhal
- read-only access: https://codeberg.org/arianne/stendhal.git
- read/write access for developers: ssh://git@codeberg.org/arianne/stendhal.git
- Web-based repository viewer: https://codeberg.org/arianne/stendhal
Marauroa
- read-only access: https://codeberg.org/arianne/marauroa.git
- read/write access for developers: ssh://git@codeberg.org/arianne/marauroa.git
- Web-based repository viewer: https://codeberg.org/arianne/marauroa
Marboard
- 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://git@codeberg.org/arianne/stendhal.git
fetch = +refs/heads/*:refs/remotes/origin/*
[user]
name = REPLACE_WITH_FULL_NAME
email = REPLACE_WITH_EMAIL_ADDRESS