[user] name = Reiner Herrmann [color] ui = auto [push] default = simple [diff] renames = copy algorithm = histogram [advice] statusHints = false resolveConflict = false [sendemail] suppresscc = self [init] templatedir = ~/.config/git/template defaultBranch = trunk [alias] ctags = !.git/hooks/ctags [pager] log = diff-highlight | less show = diff-highlight | less diff = diff-highlight | less [interactive] diffFilter = diff-highlight [tig] diff-highlight = true [pull] ff = only [column] branch = auto [merge] autoStash = true conflictStyle = zdiff3 [rebase] autoStash = true autoSquash = true [rerere] enabled = true [url "git@salsa.debian.org:"] pushInsteadOf = https://salsa.debian.org/