Set rebase as default conflit resolution method

sphawes · Mar 17, 2021 · e2eaa0d · e2eaa0d
1 parent 2d9df55
commit e2eaa0d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -0,0 +1,2 @@
+[pull]
+	rebase = true