[git] Set pull.ff and pull.rebase in configuration
[git] Cleanup mixing of tabs and spaces in config
[git] Dedent configuration file

Git itself indents using tabs, which I don't like, so don't bother
mimicking the indents if the format isn't the same anyway.