Ensure tabstop=8 in gitcommit

The status looks weird with anything else.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Ensure tabstop=8 in gitcommit