set default merge option is --no-ff
add without white space

http://qiita.com/items/b75de424038d616868db
better --word-diff

http://quattro4.hatenablog.com/entry/2012/09/22/192111
add alias f = fetch