diff --git a/.gitconfig b/.gitconfig
index a3d1ffc..f462b58 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -68,6 +68,11 @@
     ri = "rebase -i --autostash --autosquash"
     up = pull --rebase --autostash
     rebaseour = "rebase -Xours"
+[rebase]
+    # when rebasing, update the other common branch too.
+    # See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/
+    # Need git 2.38
+    updateRefs = true
 [branch]
     #New branch track remote
     #autosetupmerge = always