diff options
Diffstat (limited to 'dot.gitconfig')
| -rw-r--r-- | dot.gitconfig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dot.gitconfig b/dot.gitconfig index b4342de..303ba93 100644 --- a/dot.gitconfig +++ b/dot.gitconfig @@ -1,5 +1,6 @@ [include] path = ~/.dotfiles/grml-etc-core/etc/skel/.gitconfig + path = .gitconfig.delta [user] email = qsx@chaotikum.eu name = Thomas Schneider @@ -14,17 +15,19 @@ rofl = log --all --graph --format='%C(green)%h%Creset %C(yellow)%an%Creset %C(blue bold)%ad%Creset %C(red bold)%d%Creset%s' --date=relative --abbrev-commit --decorate [push] default = current -[instaweb] - local = true - httpd = webrick - port = 64044 - browser = google-chrome [pull] ff = only [sendemail] bcc = fcc-sent@qsuscs.de [init] defaultBranch = main +[merge] + conflictStyle = diff3 + +[diff] + colorMoved = default +[credential] + helper = libsecret [core] quotePath = false commitGraph = true |