Add function to replace tabs by spaces an remove trailing whitespace.
[git] Always create a merge commit, so GitHub picks-up these merges.