Merge branch 'main' into no-commit-autosign

EsotericEnderman · Oct 28, 2024 · 1e5c7d8 · 1e5c7d8
2 parents aaff3d5 + b97b2da
commit 1e5c7d8
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -8,8 +8,6 @@
 	provider = github
 [safe]
 	directory = *
-[pull]
-	rebase = true
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f