diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-17 13:33:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-17 13:33:02 (GMT) |
| commit | 7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92 (patch) | |
| tree | 2bdcf15abfef8e197173b5a135fe6b8391e43316 /.gitattributes | |
| parent | 930ac45cbafca79eec9ae68e07c547b5c81b8c2c (diff) | |
| parent | d9fd2f5402eeaa345691313658e02b51038f570b (diff) | |
| download | CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.zip CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.tar.gz CMake-7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92.tar.bz2 | |
Merge topic 'clang-format-source'
d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index cb3565f..d959918 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ configure crlf=input *.cxx whitespace=tab-in-indent *.txt whitespace=tab-in-indent *.cmake whitespace=tab-in-indent + +*.rst whitespace=tab-in-indent conflict-marker-size=79 |