git: Disable color
Merge .. into glue
git: Use hard tab in config