diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2017-03-24 17:30:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-24 19:16:56 (GMT) |
| commit | fda80fde76c230dda8372bf9d7208520c40f3611 (patch) | |
| tree | 71ec368a062bd601470927b13a12d64cd303b18d /.gitattributes | |
| parent | 8ba8b5537cdee251d412c331267822badc8fafdc (diff) | |
| download | CMake-fda80fde76c230dda8372bf9d7208520c40f3611.zip CMake-fda80fde76c230dda8372bf9d7208520c40f3611.tar.gz CMake-fda80fde76c230dda8372bf9d7208520c40f3611.tar.bz2 | |
KWSys 2017-03-24 (7e9f7b7b)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master).
Upstream Shortlog
-----------------
Brad King (3):
0af48083 Drop custom Git whitespace check attribute
6365886c Define a custom Git attribute to mark sources using our C style
d22c2743 clang-format.bash: Use Git attributes to mark files for formatting
Egor Pugin (3):
ce44c58a FStream: Export ReadBOM() from shared library
04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template
858d5edd Encoding: Export CommandLineArguments from shared library
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/.gitattributes b/.gitattributes index f2da782..8ce3d68 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,18 +2,22 @@ .gitattributes -export-ignore .hooks* export-ignore +# Custom attribute to mark sources as using our C code style. +#[attr]our-c-style whitespace=tab-in-indent format.clang-format + /GitSetup export-ignore /*.sh export-ignore eol=lf /*.bash export-ignore eol=lf /.clang-format export-ignore -*.c whitespace=tab-in-indent,no-lf-at-eof -*.h whitespace=tab-in-indent,no-lf-at-eof -*.h.in whitespace=tab-in-indent,no-lf-at-eof -*.cxx whitespace=tab-in-indent,no-lf-at-eof -*.hxx whitespace=tab-in-indent,no-lf-at-eof -*.hxx.in whitespace=tab-in-indent,no-lf-at-eof -*.txt whitespace=tab-in-indent,no-lf-at-eof -*.cmake whitespace=tab-in-indent,no-lf-at-eof +*.c our-c-style +*.c.in our-c-style +*.cxx our-c-style +*.h our-c-style +*.h.in our-c-style +*.hxx our-c-style +*.hxx.in our-c-style +*.cmake whitespace=tab-in-indent *.rst whitespace=tab-in-indent conflict-marker-size=79 +*.txt whitespace=tab-in-indent |