Changes between Version 3 and Version 4 of code/tools/Git

Timestamp:

Sep 13, 2010, 11:18:03 PM (14 years ago)

Author:

adrfried

Comment:

—

code/tools/Git

@@ -1 +1 @@
 = Using Git for Orxonox =
 
-Git may be used by experienced users, who want to use Git's advanced features for developing Orxonox.
+Git may be used by experienced users, who want to use Git's advanced features for developing Orxonox. This page describes how to use git-svn together with Orxonox' SVN.
 
 == Initial Checkout ==
 
+=== via Adi's git repository ===
+
+You can clone from Adi's Git repository from his Tardis account which is '''much faster''' than getting each commit via SVN. This requires SSH access on Tardis.
+
+{{{
+# We are not using git clone here, because we want to track some other references
+git init orxonox
+cd orxonox
+# You may omit the host name and the colon if you are doing this on a Tardis computer
+git remote add origin login.ee.ethz.ch:~adrfried/orxonox.git
+git config --replace-all remote.origin.fetch '+refs/remotes/svn/*:refs/remotes/svn/*'
+git fetch
+# Checkout SVN trunk as the local master branch
+git checkout -b master svn/trunk
+}}}
+
+Now you may initialize git-svn. You may also do this at a later point and just use Git without git-svn for now.
+
+{{{
+# Initialize git-svn
+git svn init --stdlayout --prefix=svn/ https://svn.orxonox.net/game/code
+# Get the latest changes from SVN in the current branch and rebase all local changes onto it
+git svn rebase
+}}}
+
 === Directly from SVN ===
 
-To checkout orxonox' [wiki:SVN]-Repository in Git use:
+Alternatively you may also checkout Orxonox' [wiki:SVN]-Repository in Git directly.
 
 {{{
@@ -17 +42 @@
 {{{--stdlayout}}} tells git-svn to follow the common "trunk/branches/tags" layout. {{{--prefix=svn/}}} prefixes the remote branches with svn/, similar to the usual origin/, otherwise you would not be able to have a local branch with the same name as in svn.
 
-=== via Adi's git repository ===
+== Basic Git Configuration ==
 
-Alternatively you can clone from Adi's git repository on his Tardis account which is '''much faster'''. This requires SSH access on Tardis.
-
-{{{
-mkdir orxonox
-cd orxonox
-# we are not using git clone here, because we want to track some other references
-git init
-# omit the host name and the colon if you are doing this on a Tardis computer
-git remote add origin login.ee.ethz.ch:~adrfried/orxonox.git
-git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
-git fetch
-# check out trunk as master
-git checkout -b master svn/trunk
-# initialize git-svn
-git svn init --stdlayout --prefix=svn/ https://svn.orxonox.net/game/code
-# get the latest changes from svn
-git svn rebase
-}}}
-
-== Basic Configuration ==
-
-Set your full name and email address:
+Set your full name and email address.
 
 {{{
@@ -47 +51 @@
 }}}
 
-Some fancy colors:
+Some fancy colors.
 
 {{{
@@ -55 +59 @@
 The {{{--global}}} argument tells git to store the config in .gitconfig in your home, so these will be usable for every git repository you have.
 
-Add something like this to your .bashrc for having a nice, git-aware bash prompt, which shows the current branch you are on and sometimes some other stuff:
-
-{{{
-PS1='\u@\h:\w$(__git_ps1 " (%s)")\$ '
-}}}
-
 == Basic Usage ==
 
-Pull changes from SVN to your local Git Repository:
+Get the latest changes from SVN in the current branch and rebase all local changes onto it.
 
 {{{
@@ -69 +67 @@
 }}}
 
-Commit local changes and push them to the SVN:
+Commit local changes and push them to the SVN.
 
 {{{