diff --git a/.config/git/config b/.config/git/config
index 480f5af..3b4b61d 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,82 +1,81 @@
 [user]
-  name = Histalek
-  email = 16392835+Histalek@users.noreply.github.com
-  signingkey = 19EC07547ED0CE82
+    name = Histalek
+    email = 16392835+Histalek@users.noreply.github.com
+    signingkey = 19EC07547ED0CE82
 
 [alias]
-  feature-branch = checkout -b
-  force-push = push --force-with-lease
-  ls-files = ls-tree --full-tree -r --name-only HEAD
+    feature-branch = checkout -b
+    force-push = push --force-with-lease
+    ls-files = ls-tree --full-tree -r --name-only HEAD
 
-  ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
-  ll = ls --numstat
+    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
+    ll = ls --numstat
 
 [color]
-  diff = auto
-  status = auto
-  branch = auto
-  interactive = auto
-  ui = auto
+    diff = auto
+    status = auto
+    branch = auto
+    interactive = auto
+    ui = auto
 
 [color "status"]
-  added = green bold
-  changed = yellow bold
-  untracked = red
+    added = green bold
+    changed = yellow bold
+    untracked = red
 
 [commit]
-  gpgsign = true
-  verbose = true
+    gpgsign = true
+    verbose = true
 
 [core]
-  editor = nvim
-  excludesfile = ~/.config/git/gitignore
+    editor = nvim
+    excludesfile = ~/.config/git/gitignore
 
 [credential]
-  helper = /usr/lib/git-core/git-credential-libsecret
+    helper = /usr/lib/git-core/git-credential-libsecret
 
 [diff]
-  submodule = log
+    submodule = log
 
 [gpg "ssh"]
-  allowedSignersFile = ~/.config/git/allowed_signers
+    allowedSignersFile = ~/.config/git/allowed_signers
 
 [grep]
-  lineNumber = true
-  extendRegexp = true
+    lineNumber = true
+    extendRegexp = true
 
 [merge]
-  stat = true
-  conflictStyle = diff3
+    stat = true
+    conflictStyle = diff3
 
 [push]
-  default = current
+    default = simple
   # needs git version > 2.37.0
-  autoSetupRemote = true
+    autoSetupRemote = true
 
 [pull]
-  rebase = true
+    rebase = true
 
 [includeIf "gitdir:~/Documents/Uni/"]
-  path = ~/.config/git/subconfigs/uni
+    path = ~/.config/git/subconfigs/uni
 
 [includeIf "gitdir:~/Repositories/uni/"]
-  path = ~/.config/git/subconfigs/uni
+    path = ~/.config/git/subconfigs/uni
 
 [includeIf "gitdir:~/Repositories/gitlab_com/"]
-  path = ~/.config/git/subconfigs/gitlab_com
+    path = ~/.config/git/subconfigs/gitlab_com
 
 [includeIf "gitdir:~/Repositories/saibotk_de/"]
-  path = ~/.config/git/subconfigs/histalek_de
+    path = ~/.config/git/subconfigs/histalek_de
 
 [includeIf "gitdir:~/Repositories/histalek_de/"]
-  path = ~/.config/git/subconfigs/histalek_de
+    path = ~/.config/git/subconfigs/histalek_de
 
 [includeIf "gitdir:~/.dotfiles/"]
-  path = ~/.config/git/subconfigs/histalek_de
+    path = ~/.config/git/subconfigs/histalek_de
 
 [init]
-  defaultBranch = main
+    defaultBranch = main
 
 [status]
-  submoduleSummary = true
-
+    submoduleSummary = true