| commit | 01afbb8f298d654b4172461936de8fc1352363bf | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Dec 13 18:27:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 13 18:27:51 2016 +0000 |
| tree | a240f9ba44fb0f80092a62621a8a7279ba300145 | |
| parent | 1b321e43e1378c4f8cb984ee6048c10dddfc86c0 [diff] | |
| parent | 3541850a9a699f17137f6c6f5a081556de7de234 [diff] |
Merge "clang-format: Adjust short functions / if settings." am: d6a5005fcb am: 3541850a9a Change-Id: Iae26e512af03094e6f38864241e79eeff32fbb6b
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:.*