Default strategy for reconciling divergent branches

2025-12-06 21:45:10 +01:00 · 2020-05-25 10:19:23 +02:00
parent 4e8c3dd959
commit 8dc6017b69
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -63,3 +63,5 @@

 [url "git://bitbucket.org/"]
 	insteadOf = "bitbucket:"
+[pull]
+	rebase = false