diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2017-04-20 19:04:04 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-20 19:35:56 (GMT) |
| commit | 22729eae17d316e709de555d2692c9c8c33918bd (patch) | |
| tree | 3ae8a29bfcfbdec45cd08700a96877cbc8acc005 /.gitattributes | |
| parent | 5785482ce0be9187ff94c1042f8978d2f11285e8 (diff) | |
| download | CMake-22729eae17d316e709de555d2692c9c8c33918bd.zip CMake-22729eae17d316e709de555d2692c9c8c33918bd.tar.gz CMake-22729eae17d316e709de555d2692c9c8c33918bd.tar.bz2 | |
KWSys 2017-04-20 (8785f84f)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 8785f84f4760da060cdb2499155bb39532f8c053 (master).
Upstream Shortlog
-----------------
Ben Boeckel (2):
ac0c67d2 gitattributes: indicate attributes to ignore when importing
3dfeb55e gitattributes: rename the c-style attribute
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/.gitattributes b/.gitattributes index 8ce3d68..7065eb5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,22 +1,12 @@ .git* export-ignore -.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 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 +*.c kwsys-c-style +*.c.in kwsys-c-style +*.cxx kwsys-c-style +*.h kwsys-c-style +*.h.in kwsys-c-style +*.hxx kwsys-c-style +*.hxx.in kwsys-c-style *.cmake whitespace=tab-in-indent *.rst whitespace=tab-in-indent conflict-marker-size=79 |