diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..7300093
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,54 @@
+[core]
+    editor = nvim
+    autocrlf = input
+    pager = delta
+    excludeFiles = ~/.gitignore
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true
+    light = false
+    line-numbers = true
+
+[merge]
+    conflictstyle = zdiff3
+
+[diff]
+    colorMoved = default
+    algorithm = histogram
+
+[rebase]
+    autosquash = true
+    autostash = true
+
+[push]
+    default = current
+    autoSetupRemote = true
+
+[init]
+    defaultBranch = main
+
+[commit]
+    verbose = true
+
+[rerere]
+    enabled = true
+
+[help]
+    autocorrect = 10
+
+[log]
+    date = iso
+
+[branch]
+    sort = -committerdate
+
+[color]
+    ui = auto
+
+[includeIf "gitdir:~/src/personal/**"]
+    path = ~/.gitconfig-personal
+[includeIf "gitdir:~/src/work/**"]
+    path = ~/.gitconfig-work
diff --git a/git/.gitconfig-personal b/git/.gitconfig-personal
new file mode 100644
index 0000000..64b57e7
--- /dev/null
+++ b/git/.gitconfig-personal
@@ -0,0 +1,7 @@
+[user]
+    name = Marvin Elsen
+    email = git@marvinelsen.com
+    signingKey = 7EBB0A920C1A1E0A52C246C6820672408CC318C2
+
+[commit]
+    gpgSign = true
diff --git a/git/.gitignore b/git/.gitignore
new file mode 100644
index 0000000..090a1f0
--- /dev/null
+++ b/git/.gitignore
@@ -0,0 +1,2 @@
+.idea
+.DS_Store