diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:50 +0900 |
| commit | 4812340b784ede08aabc21e9c43973a472dfb902 (patch) | |
| tree | f63ccbe29db733059aa8563c93de1178eb4c3b28 | |
| parent | 8f2733a04bc458d1f2292d5227eb240b0b297862 (diff) | |
| parent | 42efde4c299141ddf1ca5b63909b94ab3875aa14 (diff) | |
| download | git-4812340b784ede08aabc21e9c43973a472dfb902.tar.gz | |
Merge branch 'bw/git-clang-format'
Adjust clang-format penalty parameters.
* bw/git-clang-format:
clang-format: adjust line break penalties
| -rw-r--r-- | .clang-format | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index 3ede2628d2..56822c116b 100644 --- a/.clang-format +++ b/.clang-format @@ -153,13 +153,13 @@ KeepEmptyLinesAtTheStartOfBlocks: false # Penalties # This decides what order things should be done if a line is too long -PenaltyBreakAssignment: 100 -PenaltyBreakBeforeFirstCallParameter: 100 -PenaltyBreakComment: 100 +PenaltyBreakAssignment: 10 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 PenaltyBreakFirstLessLess: 0 -PenaltyBreakString: 100 -PenaltyExcessCharacter: 5 -PenaltyReturnTypeOnItsOwnLine: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 5 # Don't sort #include's SortIncludes: false |