Merge branch 'main' of ssh://git.a09.uk:48765/alex/alex-environ
This commit is contained in:
commit
37bb296adf
2 changed files with 14 additions and 8 deletions
|
@ -1,5 +1,4 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
extends: default
|
extends: default
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
@ -18,21 +17,25 @@ rules:
|
||||||
empty-lines: enable
|
empty-lines: enable
|
||||||
empty-values: enable
|
empty-values: enable
|
||||||
hyphens: enable
|
hyphens: enable
|
||||||
indentation: enable
|
indentation:
|
||||||
|
spaces: consistent
|
||||||
|
indent-sequences: consistent
|
||||||
key-duplicates: enable
|
key-duplicates: enable
|
||||||
key-ordering: disable
|
key-ordering: disable
|
||||||
line-length: enable
|
line-length:
|
||||||
|
max: 100
|
||||||
|
allow-non-breakable-words: true
|
||||||
|
allow-non-breakable-inline-mappings: true
|
||||||
new-line-at-end-of-file: enable
|
new-line-at-end-of-file: enable
|
||||||
new-lines: enable
|
new-lines: enable
|
||||||
octal-values: enable
|
octal-values: enable
|
||||||
quoted-strings:
|
quoted-strings:
|
||||||
quote-type: double
|
quote-type: double
|
||||||
required: only-when-needed
|
required: false
|
||||||
allow-quoted-quotes: true
|
allow-quoted-quotes: true
|
||||||
trailing-spaces: enable
|
trailing-spaces: enable
|
||||||
truthy:
|
truthy:
|
||||||
allowed-values:
|
allowed-values:
|
||||||
- 'true'
|
- "true"
|
||||||
- 'false'
|
- "false"
|
||||||
- 'on'
|
# vim: ft=yaml
|
||||||
- 'off'
|
|
||||||
|
|
|
@ -22,3 +22,6 @@
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
hooksPath = ~/.alex-environ/private/home/git_hooks
|
hooksPath = ~/.alex-environ/private/home/git_hooks
|
||||||
|
|
||||||
|
[alias]
|
||||||
|
adog = log --all --decorate --oneline --graph
|
||||||
|
|
Loading…
Reference in a new issue