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]
|
||||
name = Vladimír Dudr
|
||||
email = vladimir@tango-dj.cz
|
||||
email = dudr@metrans.cz
|
||||
|
||||
[http "https://gopkg.in"]
|
||||
followRedirects = true
|
||||
|
@ -27,9 +27,6 @@
|
|||
syntax-theme = gruvbox-dark
|
||||
hyperlinks = true
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
|
||||
[diff]
|
||||
algorithm = patience
|
||||
external = difft
|
||||
|
@ -42,3 +39,13 @@
|
|||
[merge]
|
||||
tool = nvimdiff
|
||||
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