[init] defaultBranch = main [user] name = Sebastian Bugge useConfigOnly = true [pull] ff = false rebase = true [rebase] autoStash = true autoSquash = true [alias] publish = !git pull && git push [push] default = current autoSetupRemote = true [rerere] enabled = true [advice] skippedCherryPicks = false [help] autocorrect = 10 [include] path = ~/.gitconfig_local [includeIf "gitdir:~/code/"] path = ~/code/.gitconfig [branch] sort = committerdate # difftastic stuff [diff] external = difft tool = difftastic [difftool] prompt = false [pager] difftool = true [diff] tool = difftastic