Merge topic 'gitattributes-import-markers'

3dfeb55e gitattributes: rename the c-style attribute
ac0c67d2 gitattributes: indicate attributes to ignore when importing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !28

.gitattributes

 .git*            export-ignore
+# import off
 .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
+# Custom attribute to mark sources as using the kwsys C code style.
+[attr]kwsys-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
+# import on
 
-*.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