?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Merge branch 'jc/branch-merged'
[git/vmiklos.git] / .gitattributes
blob6b9c715d21d5486e59083fb6071566aa6ecd4d42
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace
Miklos' Git tree to make git-merge a builtin.