diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2016-12-14 16:15:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-14 16:16:55 (GMT) |
| commit | a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf (patch) | |
| tree | 48fe0a559802900eedf43abc38d483f65f270abc /.gitattributes | |
| parent | 1b50bd3f5c1f608a84df89c2f5e187a53f0be31d (diff) | |
| download | CMake-a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf.zip CMake-a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf.tar.gz CMake-a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf.tar.bz2 | |
KWSys 2016-12-14 (95a7e234)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 95a7e234ffd0c6bdfaa8b21c59a119198c050164 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
e0967411 Add a script to help update third-party sources
Brad King (10):
98505f79 Add script to update GitSetup from upstream
365edba8 GitSetup: Tell Git not to export .gitattributes
41a7fe5b Add pre-commit hook to check whether SetupForDevelopment must re-run
17a1200c Convert developer setup scripts away from Gerrit Code Review
5f206c3a Tell Git to use a distinct conflict marker size in `.rst` files
33f828d4 README: Convert from `.txt` to `.rst` markup
56b707dd README: Add section about reporting bugs
140357ea CONTRIBUTING: Document contribution through the Kitware GitLab Instance
4b7bf8e4 Tell Git not to export any `.sh` or `.bash` scripts
e25eb8dc CONTRIBUTING: Add step for running developer setup script
GitSetup Upstream (3):
fed3d191 GitSetup 2012-09-27 (341043cf)
a0144297 GitSetup 2016-12-13 (8af10838)
868c1e68 GitSetup 2016-12-13 (cd5ada6d)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 8027e27..f2da782 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,13 +1,12 @@ .git* export-ignore .gitattributes -export-ignore +.hooks* export-ignore /GitSetup export-ignore -/SetupForDevelopment.sh export-ignore eol=lf -/clang-format.bash export-ignore eol=lf +/*.sh export-ignore eol=lf +/*.bash export-ignore eol=lf /.clang-format export-ignore -/CONTRIBUTING.rst conflict-marker-size=78 - *.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 @@ -16,3 +15,5 @@ *.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 + +*.rst whitespace=tab-in-indent conflict-marker-size=79 |