diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..9bb065f
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,24 @@
+[user]
+    name = Jonas Müller
+    email = j.mueller@nexus.local
+[core]
+    editor = nvim
+    autocrlf = input
+    excludesfile = ~/.dotfiles/git/.gitignore_global
+[push]
+    default = current
+    autoSetupRemote = true
+[pull]
+    rebase = true
+[rebase]
+    autoStash = true
+[diff]
+    tool = nvimdiff
+[alias]
+    st = status
+    co = checkout
+    br = branch
+    lg = log --oneline --graph --decorate --all
+    undo = reset HEAD~1 --mixed
+    # I don't know why this works but it does
+    fixup = "!f() { git commit --fixup $1 && git rebase -i --autosquash $1~1; }; f"
diff --git a/git/.gitignore_global b/git/.gitignore_global
new file mode 100644
index 0000000..e06ee06
--- /dev/null
+++ b/git/.gitignore_global
@@ -0,0 +1,8 @@
+.DS_Store
+.vscode/
+*.swp
+*.swo
+.idea/
+__pycache__/
+.env.local
+*.log