summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-13 19:13:55 +0100
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-12-13 19:13:56 +0100
commitd6a5005fcb1f2ea6cfbdcb424497b626aeab7e16 (patch)
treee2d7107e971b0fda72d15b8b1bb555fec62d1c4d
parentMerge "Revert "write_bootloader_message(<options>) should not reset stage field."" (diff)
parentclang-format: Adjust short functions / if settings. (diff)
downloadandroid_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar.gz
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar.bz2
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar.lz
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar.xz
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.tar.zst
android_bootable_recovery-d6a5005fcb1f2ea6cfbdcb424497b626aeab7e16.zip
-rw-r--r--.clang-format3
1 files changed, 2 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index b8c642840..532278864 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:.*