Do you git-flow ?

Lately at my current contract we have been using a very nice branching model for our Git project repo. Its called Git Flow, and In-My-Honest-Opinion it is a very nice divide-and-conquer process of managing your branching into “features”, “hotfixes”, “patches”… for your project team.

You should have a read: http://nvie.com/posts/a-successful-git-branching-model/

…and from the same nice guy, use: https://github.com/nvie/gitflow

Useful Git

Here are a few helpful tips I collected online on how to setup your Git that little bit more nicely…

Global ignore file:

echo ".DS_Store" >> ~/.gitignore
git config --global core.excludesfile ~/.gitignore

SVN-like shortcuts for often used commands:

git config --global alias.st status
git config --global alias.ci commit
git config --global alias.co checkout
git config --global alias.br branch

Information about the author/commiter:

git config --global user.name "Your Name Comes Here"
git config --global user.email you@yourdomain.example.com

Colorized output:

git config --global color.branch auto
git config --global color.diff auto
git config --global color.interactive auto
git config --global color.status auto

TextMate as the default editor:

git config --global core.editor "mate -w"

Opendiff (FileMerge) to More >