[color] diff = auto status = auto branch = auto ui = true [user] name = Felix Buehler email = account@buehler.rocks [merge] defaultToUpstream = true tool = vimdiff conflictstyle = diff3 [core] editor = vim eol = native pager = delta || (diff-so-fancy | less --tabs=4 -RFX) quotepath = false commitGraph = true [interactive] diffFilter = delta --color-only [alias] committree = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit ct = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit d = difftool git = !exec git s = status unstage = reset HEAD -- [rerere] enabled = true [branch] autoSetupMerge = always # Fetch also the merge requests data for common remotes # GitHub uses the "pull" space, GitLab the "merge-requests" [remote "origin"] fetch = +refs/pull/*/head:refs/remotes/origin/pull/* fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* [remote "upstream"] fetch = +refs/pull/*/head:refs/remotes/upstream/pull/* fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/* [diff] tool = vimdiff colormoved = default [difftool] prompt = false [color.blame] repeatedLines = yellow [blame] coloring = repeatedLines [color "diff-highlight"] oldNormal = red oldHighlight = red bold 52 newNormal = green newHighlight = green bold 22 [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f required = true [rebase] autosquash = true [color "diff"] meta = yellow bold commit = yellow bold frag = magenta bold old = red bold new = green bold whitespace = red reverse [gc] writeCommitGraph = true [delta] line-numbers = true navigate = true light = false [pull] ff = only [url "ssh://git@github.com/"] pushInsteadOf = https://github.com/ [url "ssh://git@gitlab.com/"] pushInsteadOf = https://gitlab.com/ [url "ssh://git@bitbucket.org/"] pushInsteadOf = https://bitbucket.org/ [push] autoSetupRemote = true