diff options
| author |  jueminyang <31513082+jueminyang@users.noreply.github.com> | 2017-10-17 14:50:09 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-17 14:50:09 -0400 |
| commit | 0a86ee86ef19bc54afcc779fcf3e069a09e3f3e5 (patch) | |
| tree | 18b89337e269a5f5206d2e7f1f5ca3c9a5581dd5 | |
| parent | 6de53819a7173bd446156237a37f53464b7732cc (diff) | |
| parent | 894a869e7b5d7c1c04b9583e706e21cef6a1d6d6 (diff) | |
Merge pull request #31 from efcs/add-clang-format
Add Google-style .clang-format file.
| -rw-r--r-- | .clang-format | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..06ea346a --- /dev/null +++ b/.clang-format @@ -0,0 +1,4 @@ +--- +Language: Cpp +BasedOnStyle: Google +... diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9c89bbc..865da86d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,7 +47,8 @@ will be expected to conform to the style outlined made and **why** it was made. Link to a GitHub issue if it exists. * Don't fix code style and formatting unless you are already changing that - line to address an issue. PRs with irrelevant changes won't be merged. If + line to address an issue. Formatting of modified lines may be done using + `git clang-format`. PRs with irrelevant changes won't be merged. If you do want to fix formatting or style, do that in a separate PR. * Unless your PR is trivial, you should expect there will be reviewer comments |