blob: 699899bbc5a504855320b2460f34ef368d94c859 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
[user]
name = Charles Cabergs
email = me@cacharle.xyz
signingkey = me@cacharle.xyz
[log]
decorate = full
[pull]
rebase = false
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
keepBackup = false
prompt = false
[mergetool "vimdiff"]
cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='"
[commit]
gpgsign = true
[init]
defaultBranch = master
[difftool "bat"]
cmd = "/usr/bin/bat --diff $REMOTE"
[difftool]
prompt = false
[diff]
tool = bat
[core]
editor = "VIMINIT='' nvim"
# vim:ft=gitconfig
|
