Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changes between Initial Version and Version 1 of code/tools/Git


Ignore:
Timestamp:
Jan 27, 2010, 12:35:55 AM (15 years ago)
Author:
adrfried
Comment:

started some documentation for using git

Legend:

Unmodified
Added
Removed
Modified
  • code/tools/Git

    v1 v1  
     1= Using Git for Orxonox =
     2
     3Git may be used by experienced users, who want to use Git's advanced features for developing Orxonox.
     4
     5== Initial Checkout ==
     6
     7To checkout orxonox' [wiki:SVN]-Repository in Git use:
     8
     9{{{
     10git svn clone --stdlayout --prefix=svn/ https://svn.orxonox.net/game/code orxonox
     11}}}
     12
     13This will check out the whole history of the Project code with all the branches and tags, it will use about 150 MB of disk space and it may take a long time (while checking out it will use more disk space, until things get automatically compressed by {{{git gc}}}).
     14
     15== Basic Configuration ==
     16
     17Set your full name and email address:
     18
     19{{{
     20git config --global user.name "Your Name Comes Here"
     21git config --global user.email you@yourdomain.example.com
     22}}}
     23
     24Some fancy colors:
     25
     26{{{
     27git config --global color.ui auto
     28}}}
     29
     30The --global argument tells git to store the config in .gitconfig in your home, so these will be usable for every git repository you have.
     31
     32Add 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:
     33
     34{{{
     35PS1='\u@\h:\w$(__git_ps1 " (%s)")\$ '
     36}}}
     37
     38== Basic Usage ==
     39
     40Pull changes from SVN to your local Git Repository:
     41
     42{{{
     43git svn rebase
     44}}}
     45
     46Commit local changes and push them to the SVN:
     47
     48{{{
     49git commit -a
     50git svn dcommit
     51}}}
     52
     53== Branches ==
     54
     55TBD.
     56
     57== Documentation ==
     58
     59To learn more about git see: http://git-scm.com/documentation