Introduce eol normalization.
Add white space diff color and set branch autorebase to always.
Remove author and github.
Merge conflict.