Merge branch 'sb/pull-rebase'
[git] / .gitattributes
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace