remove ff only merge commits
Merge branch 'master' of github.com:rsb/dotfiles
Merge branch 'master' of github.com:rsb/dotfiles
Merge branch 'master' of github.com:rsb/dotfiles
Merge branch 'master' of github.com:rsb/dotfiles
making the newline portable