{{#if (and email git_username)~}} [user] name = {{git_username}} email = {{email}} {{/if~}} [merge] tool = vimdiff [diff] tool = vimdiff trustExitCode = true [difftool] prompt = true [alias] d = difftool co = checkout ci = commit -v l = log --oneline --graph --all ls = log --graph --pretty=format:\"%h <%an> %ar %s\" --all st = status br = branch [mergetool] keepBackup = false [mergetool "vimdiff"] cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [core] editor = vim # vim: ft=gitconfig