[git] avoid useless whitespace and leftover conflict markers

This commit is contained in:
Sami Samhuri 2017-09-09 11:28:12 -07:00
parent e392a4b936
commit e66b30080a
No known key found for this signature in database
GPG key ID: F76F41F04D99808F
2 changed files with 4 additions and 0 deletions

3
git-hooks/pre-commit Executable file
View file

@ -0,0 +1,3 @@
#!/bin/bash
git diff --check

View file

@ -10,6 +10,7 @@
quotepath = false
whitespace = trailing-space,space-before-tab
excludesfile = ~/config/gitignore
hooksPath = ~/config/git-hooks
[diff]
mnemonicprefix = true
renames = copies