git: add config
This commit is contained in:
parent
b8f3099286
commit
a5c73d5c8e
1 changed files with 11 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
||||||
[user]
|
[user]
|
||||||
name = Vladimír Dudr
|
name = Vladimír Dudr
|
||||||
email = vladimir@tango-dj.cz
|
email = dudr@metrans.cz
|
||||||
|
|
||||||
[http "https://gopkg.in"]
|
[http "https://gopkg.in"]
|
||||||
followRedirects = true
|
followRedirects = true
|
||||||
|
@ -27,9 +27,6 @@
|
||||||
syntax-theme = gruvbox-dark
|
syntax-theme = gruvbox-dark
|
||||||
hyperlinks = true
|
hyperlinks = true
|
||||||
|
|
||||||
[interactive]
|
|
||||||
diffFilter = delta --color-only
|
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
algorithm = patience
|
algorithm = patience
|
||||||
external = difft
|
external = difft
|
||||||
|
@ -42,3 +39,13 @@
|
||||||
[merge]
|
[merge]
|
||||||
tool = nvimdiff
|
tool = nvimdiff
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
[credential]
|
||||||
|
helper = gopass
|
||||||
|
[credential "https://gitlab.corp.metrans.cz"]
|
||||||
|
username = dudr
|
||||||
|
|
||||||
|
[diff "sops"]
|
||||||
|
textconv = sops --config /dev/null -d
|
||||||
|
|
||||||
|
[diff "ansible-vault"]
|
||||||
|
textconv = ansible-vault view --vault-password-file <(gopass show --password metrans/ansible-vault)
|
Loading…
Add table
Reference in a new issue