technologyGit

Configuration

Cache password

To avoid to retype your password when using HTTPS use

git config --global credential.helper "cache --timeout=3600"

to enable password caching for 1 hour, here.

git-flow

We work with this git branching model. This model is also associated with the git addon git flow which is demonstrated in this video. besides the video this git flow cheat sheet is very helpful. To install git flow type in sudo apt-get install git-flow

Our settings for git flow are as follows (like default)

• Branch for production release: master
• Branch name for production releases: master
• Branch name for "next release" development: develop
• Feature branches? feature/
• Release branches? release/
• Hotfix branches? hotfix/
• Support branches? support/
• Version tag prefix? <empty>

meld

Meld is a tool to compare similar files in graphical interface with each other. To install it type: sudo apt-get install meld. This tool can be combined with git diff and git mergetool as explained in the following two blog articles.

• better view diffs with meld: http://blog.deadlypenguin.com/blog/2011/05/03/using-meld-with-git-diff/
• better handle merge conflicts with meld: http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html

additional tools

• gitk
• git gui