| commit | d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Dec 13 18:13:55 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 13 18:13:56 2016 +0000 |
| tree | e2d7107e971b0fda72d15b8b1bb555fec62d1c4d | |
| parent | c908f4f0e33ab84e9be6ce40c58c9a9061fd359e [diff] | |
| parent | e65fa0a892e617edf59ff2f3468cbd2fc4ff6101 [diff] |
Merge "clang-format: Adjust short functions / if settings."
diff --git a/.clang-format b/.clang-format index b8c6428..5322788 100644 --- a/.clang-format +++ b/.clang-format
@@ -1,6 +1,7 @@ BasedOnStyle: Google AllowShortBlocksOnASingleLine: false -AllowShortFunctionsOnASingleLine: false +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: true ColumnLimit: 100 CommentPragmas: NOLINT:.*