2021-11-26 13:01:28 +00:00
|
|
|
{{#if (and email git_username)~}}
|
|
|
|
|
[user]
|
|
|
|
|
name = {{git_username}}
|
|
|
|
|
email = {{email}}
|
|
|
|
|
{{/if~}}
|
|
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
[diff]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
[difftool]
|
2022-05-03 07:55:34 +00:00
|
|
|
prompt = true
|
2021-11-26 13:01:28 +00:00
|
|
|
[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
|
2022-05-03 07:55:34 +00:00
|
|
|
[mergetool "vimdiff"]
|
|
|
|
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
2021-11-26 13:01:28 +00:00
|
|
|
[core]
|
|
|
|
|
editor = vim
|
|
|
|
|
|
|
|
|
|
# vim: ft=gitconfig
|
