[user] email = mainbollian@gmail.com name = Ian Boll [push] default = simple [merge] tool = nvim [mergetool "kdiff3"] # just an example cmd = kdiff3 "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED" trustExitCode = false # define command which will be used when "nvim" is set as a merge tool [mergetool "nvim"] cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\" [color "ui"] HEAD = red [pretty] glog = format:%C(bold green)%h%C(reset) %C(bold blue)%ad%C(reset) (%C(cyan)%ar%C(reset)) %C(auto)%d%n\t%C(reset)%s %C(dim white)- %an%C(reset)%n [alias] glog = !git --no-pager log --color --graph -n 10 --pretty=glog --all glogl = log --graph --pretty=glog --all st = status ch = checkout [color "decorate"] tag = dim red branch = bold magenta reverse remoteBranch = bold yellow HEAD = green reverse [core] autocrlf = input excludesfile = ~/.config/git/ignore editor = nano [url "https://invent.kde.org/"] insteadOf = kde: [url "ssh://git@invent.kde.org/"] pushInsteadOf = kde: [pull] ff = only [diff] guitool = kdiff3 [difftool "kdiff3"] trustExitCode = false [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f