summaryrefslogtreecommitdiff
path: root/.config/git/config
diff options
context:
space:
mode:
authorAdam <adam@adast.xyz>2022-05-30 22:42:20 +0200
committerAdam <adam@adast.xyz>2022-05-31 00:31:48 +0200
commit9c5eba86f0b3d32fe3fd45c3dc04e26bb65f9a77 (patch)
tree6ebf32a9a4cf912c891afd96e0d13193755689be /.config/git/config
parent6b80da230fd5c053acdaec76b97088d83fba8cc5 (diff)
Added gitconfig (delta)
Diffstat (limited to '.config/git/config')
-rw-r--r--.config/git/config21
1 files changed, 21 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..50006b9
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,21 @@
+[user]
+ name = Adam
+ email = adam@adast.xyz
+
+[core]
+ pager = delta
+
+[interactive]
+ diffFilter = delta --color-only
+
+[delta]
+ syntax-theme = TwoDark
+ commit-decoration-style = yellow ol
+ hunk-header-decoration-style = magenta box
+ hunk-header-style = syntax file line-number
+ file-style = omit
+ plus-style = syntax "#003800"
+ minus-style = syntax "#3f0001"
+
+[merge]
+ conflictstyle = diff3