Files
dotfiles/.gitconfig
Tristaan f21bbe6edb Cleanup dotfiles, fixed permissions
Also updated i3 config
2021-01-19 17:19:26 +01:00

25 lines
536 B
INI

[user]
name = Tristaan
email = tristan.sneider@gmail.com
[diff]
tool = nvimdiff
[difftool]
prompt = true
[difftool "nvimdiff"]
cmd = "nvim -d $LOCAL $REMOTE"
[merge]
tool = nvimdiff
[mergetool]
prompt = true
[mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[alias]
ch = checkout
co = commit
st = status
br = branch
hist = log --pretty=format:\"[%ad] %s%d\" --date=format:'%d.%m.%Y %H:%M:%S'
type = cat-file -t
dump = cat-file -p