diff options
| -rw-r--r-- | dot.gitconfig | 3 | ||||
| -rw-r--r-- | dot.gitconfig.delta | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/dot.gitconfig b/dot.gitconfig index 115e630..29a452c 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 @@ -23,3 +24,5 @@ bcc = fcc-sent@qsuscs.de [init] defaultBranch = main +[merge] + conflictStyle = diff3 diff --git a/dot.gitconfig.delta b/dot.gitconfig.delta new file mode 100644 index 0000000..c27f472 --- /dev/null +++ b/dot.gitconfig.delta @@ -0,0 +1,12 @@ +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + + # delta detects terminal colors automatically; set one of these to disable auto-detection + # dark = true + # light = true |