1234567891011121314151617181920212223242526272829303132333435363738 |
- [user]
- name = Adam
- email = git@apiote.tk
- signingkey = C6860D62A0321C8CB06482D98B0A436337615D8F
- [push]
- default = simple
- [core]
- editor = kak
- autocrlf = input
- excludesfile = ~/.gitignore
- [color]
- ui = auto
- [merge]
- conflictstyle = diff3
- tool = env LOCAL="$LOCAL" BASE="$BASE" REMOTE="$REMOTE" MERGED="$MERGED" kakmerge
- [mergetool]
- prompt = false
- [mergetool "kakmerge"]
- cmd = kakmerge
- trustExitCode = true
- [diff]
- tool = kitty
- guitool = kitty.gui
- [difftool]
- prompt = false
- trustExitCode = true
- [difftool "kitty"]
- cmd = kitty +kitten diff $LOCAL $REMOTE
- [difftool "kitty.gui"]
- cmd = kitty kitty +kitten diff $LOCAL $REMOTE
- [gpg]
- program = gpg2
- [pull]
- rebase = true
- [rerere]
- enabled = true
- autoupdate = true
|