| commit | 3541850a9a699f17137f6c6f5a081556de7de234 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Dec 13 18:21:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 18:21:50 2016 +0000 |
| tree | e2d7107e971b0fda72d15b8b1bb555fec62d1c4d | |
| parent | 09197c47e2dc6aff492bd4fd8a9aea844dcc3333 [diff] | |
| parent | d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16 [diff] |
Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb Change-Id: I2d8d58e4361207656e883cf21116eef9f35bf521
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:.*