[color] ui = auto status = auto branch = auto [core] editor = nvim [merge] tool = nvimdiff [mergetool "nvimdiff"] cmd = nvim -d $LOCAL $MERGED $BASE $REMOTE -c 'wincmd w' -c 'wincmd J' [diff] tool = nvimdiff [difftool] prompt = false [difftool "nvimdiff"] cmd = "nvim -d -u ~/.config/nvim/init.vim \"$LOCAL\" \"$REMOTE\"" [user] name = Martin Pander email = m@p.de [alias] st = status ci = commit co = checkout br = branch pl = pull ps = push mno = merge --no-ff lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit [push] default = matching [init] templatedir = ~/.git_template [credential] helper = store