diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:14 -0800 |
| commit | 0c13c4f19dfee3f1704bfca5af5e7eca14203a1c (patch) | |
| tree | deeece4e6e211689d2a2a0e5ded62414da8a889f | |
| parent | 46e915c42bdef79caf65ebdd26ee39aa0c011ebc (diff) | |
| parent | a3715d43e8e0de4fa1ac98721ad195ca5d46a439 (diff) | |
| download | git-0c13c4f19dfee3f1704bfca5af5e7eca14203a1c.tar.gz | |
Merge branch 'po/clang-format-functype-weight'
Prevent "clang-format" from breaking line after function return type.
* po/clang-format-functype-weight:
clang-format: adjust penalty for return type line break
| -rw-r--r-- | .clang-format | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index 611ab4750b..12a89f95f9 100644 --- a/.clang-format +++ b/.clang-format @@ -163,7 +163,7 @@ PenaltyBreakComment: 10 PenaltyBreakFirstLessLess: 0 PenaltyBreakString: 10 PenaltyExcessCharacter: 100 -PenaltyReturnTypeOnItsOwnLine: 5 +PenaltyReturnTypeOnItsOwnLine: 60 # Don't sort #include's SortIncludes: false |