Git getting started¶

• Table of contents
• Git getting started
  • Setup
    • avoid end of line problems (CRLF/LF) in the development team
    • configure rebase as default pull strategy for new branches

• Git-flowWorkflow
• Git-tools
• GitDebugging
• GitSvn

Git is a distributed revision control system with an emphasis on speed. Git was initially designed and developed by Linus Torvalds for Linux kernel development.

Every Git working directory is a full-fledged repository with complete history and full revision tracking capabilities, not dependent on network access or a central server.

Setup¶

setup your name and email in @.gitconfig@:

[user]
    name = Xxxxx Yyyyyyyy
    email = x.yyyyy@bgbm.org

The name and email address needs to be identical to the settings in the git repository.

avoid end of line problems (CRLF/LF) in the development team¶

for details see:

• https://help.github.com/articles/dealing-with-line-endings/#platform-all

• http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/

You are on linux:

git config --global core.autocrlf input

you are on windows:

git config --global core.autocrlf true

NOTE: A much better solution you be to use the .gitattributes to set the correct behavior in the repositories but this is not feasible for us due to a bug in EGit: https://bugs.eclipse.org/bugs/show_bug.cgi?id=342372

configure rebase as default pull strategy for new branches¶

[branch]
    autosetuprebase=always

you can set this by

git config --global branch.autosetuprebase always 

for existing branches¶

For branches that already exist this setting must be applied individually, for master and develop this should be:

git config branch.master.rebase true
git config branch.develop.rebase true

, which can be scripted for multiple branches/repos if necessary.