From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Feb 2018 21:39:14 +0000 (-0800)
Subject: Merge branch 'po/clang-format-functype-weight'
X-Git-Tag: v2.17.0-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c13c4f19dfee3f1704bfca5af5e7eca14203a1c?hp=46e915c42bdef79caf65ebdd26ee39aa0c011ebc

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
---

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