Merge branch 'nm/grep-object-sha1-lock'

[git.git] / .gitattributes

* whitespace=!indent,trail,space
*.[ch] whitespace=indent,trail,space
*.sh whitespace=indent,trail,space