Merge branch 'main' of ssh://git.zacke.dev:222/wholteza/dotfiles

2025-09-20 18:10:17 +02:00
parent f9ffb35a17 ef8fc748ac
commit 432bd834d5
3 changed files with 34 additions and 17 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,3 +17,5 @@
  pu = pull
  r = reset
  s = status
+[pull]
+	rebase = false