Git tips and tricks

Don't allow anything but fast forward merges:

One can avoid ugly merge commits with this:

$ git config --global merge.ff only

and if there's not a way to rebase to allow a FF merge, one can use:

$ git merge --no-ff

See this note about it and thanks to Wes McKinney for sharing it.