diff --git a/dotfiles.org b/dotfiles.org
index 7103063..a87d1f8 100644
--- a/dotfiles.org
+++ b/dotfiles.org
@@ -21,6 +21,28 @@ This file contains all configurations across all my machines. Well, most of them
   export PATH="~/.dotfiles/scripts:$PATH"
   export PATH="/usr/local/bin:$PATH"
 #+end_src
+** Git
+- TODO: re-evaliate merge conflictstyle
+#+begin_src ini :tangle ~/.gitconfig
+[user]
+	name = Ian Keane
+	email = ian@keane.sh
+[alias]
+	find-file = "!for branch in `git for-each-ref --format=\"%(refname)\" refs/heads`; do echo \"${branch}:\"; git ls-tree -r --name-only $branch | nl -bn -w3 | grep \"$1\"; done; :"
+[core]
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
+[delta]
+    navigate = true
+    side-by-side = true
+    line-numbers-left-format = ""
+    line-numbers-right-format = "│ "
+[merge]
+    conflictstyle = diff3
+[diff]
+    colorMoved = default
+#+end_src
 
 ** TODO Autojump
 ** TODO Atuin
diff --git a/slackware/home/git/.config/git/README.md b/slackware/home/git/.config/git/README.md
deleted file mode 100644
index 0dd2da6..0000000
--- a/slackware/home/git/.config/git/README.md
+++ /dev/null
@@ -1 +0,0 @@
-For repo-specific config, use .git/config in the repo itself
diff --git a/slackware/home/git/.config/git/config b/slackware/home/git/.config/git/config
deleted file mode 100644
index 65d09ec..0000000
--- a/slackware/home/git/.config/git/config
+++ /dev/null
@@ -1,3 +0,0 @@
-[user]
-    email = ian@keane.sh
-    name = Ian Keane
diff --git a/slackware/home/git/.gitconfig b/slackware/home/git/.gitconfig
deleted file mode 100644
index b9ecae0..0000000
--- a/slackware/home/git/.gitconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-[user]
-	name = Ian Keane
-	email = ian@keane.sh
-
-[alias]
-	find-file = "!for branch in `git for-each-ref --format=\"%(refname)\" refs/heads`; do echo \"${branch}:\"; git ls-tree -r --name-only $branch | nl -bn -w3 | grep \"$1\"; done; :"
-
-[core]
-    pager = delta
-
-[interactive]
-    diffFilter = delta --color-only
-
-[delta]
-    navigate = true
-    side-by-side = true
-    line-numbers-left-format = ""
-    line-numbers-right-format = "│ "
-
-[merge]
-    conflictstyle = diff3
-
-[diff]
-    colorMoved = default