Arianne Source Code Repositories: Difference between revisions

Content deleted Content added

Inline

@@ Line 21: / Line 21: @@
 : read/write access for develoeprs: ssh://USERNAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
-Note for developers:
+== Example .git/config for developers ==
- git config user.name NICKNAME
+<pre>
- git config user.email USERNAME@users.sourceforge.net
+    [core]
+            repositoryformatversion = 0
+            filemode = true
+            logallrefupdates = true
+            autocrlf = false
+    [remote "origin"]
+            url = ssh://USENAME@arianne.git.sourceforge.net/gitroot/arianne/marauroa.git
+            fetch = +refs/heads/*:refs/remotes/origin/*
+    [user]
+            name = USERNAME
+            email = USERNAME@users.sourceforge.net
+</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 form Sourceforge and then "merging" them.
+* on the command line git pull does both things, but i think that is not yet implemented in Eclipse.
+* some of the dialog are very complicated on first glance.
 [[Category:Marauroa]]

Navigation menu