diff --git a/etc/git/gitconfig b/etc/git/gitconfig
index 9c7827ced2b..4dc2f696062 100644
--- a/etc/git/gitconfig
+++ b/etc/git/gitconfig
@@ -7,7 +7,7 @@
 [format]
         forceinbodyfrom = true  # help preserve commit authorship
         thread = shallow
-        useAutoBase = true
+        useAutoBase = whenAble
 
 [pull]
         rebase = true