Avoid merge commits

Git configuration to avoid dull merge commits like 

Merge branch 'master' of  ...