diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-24 19:17:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-24 19:17:25 (GMT) |
| commit | ea2a91a43279616a602b641d827e07912ac9c0b9 (patch) | |
| tree | 6389b3d04602600e2efb1c6de33d55638a4ac4b0 /Source/kwsys/.gitattributes | |
| parent | 64490637840b05da7f0829aa52cae7f3923b805e (diff) | |
| parent | fda80fde76c230dda8372bf9d7208520c40f3611 (diff) | |
| download | CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.zip CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.tar.gz CMake-ea2a91a43279616a602b641d827e07912ac9c0b9.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-03-24 (7e9f7b7b)
Resolve conflicts in `.gitattributes` by integrating changes from both
sides. Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway). Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
Diffstat (limited to 'Source/kwsys/.gitattributes')
| -rw-r--r-- | Source/kwsys/.gitattributes | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes index a121ad1..3583f39 100644 --- a/Source/kwsys/.gitattributes +++ b/Source/kwsys/.gitattributes @@ -1,12 +1,15 @@ .git* 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 + +* -format.clang-format |