diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 11:55:20 -0700 |
| commit | e223c2c77f7e578e085c80c59440475cff056dc0 (patch) | |
| tree | 6354c73dcef56950c400c8e2c502c02c81e2006d | |
| parent | Merge branch 'mm/status-suggest-merge-abort' into maint (diff) | |
| parent | .gitattributes: set file type for C files (diff) | |
| download | tgif-e223c2c77f7e578e085c80c59440475cff056dc0.tar.xz | |
Merge branch 'rs/help-c-source-with-gitattributes' into maint
The .c/.h sources are marked as such in our .gitattributes file so
that "git diff -W" and friends would work better.
* rs/help-c-source-with-gitattributes:
.gitattributes: set file type for C files
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 5e98806c6c..320e33c327 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ * whitespace=!indent,trail,space -*.[ch] whitespace=indent,trail,space +*.[ch] whitespace=indent,trail,space diff=cpp *.sh whitespace=indent,trail,space |