git: rebase with updateRefs

2023-01-17 17:53:54 +01:00 · 2023-01-17 17:53:54 +01:00 · c0eb09f1c9
commit c0eb09f1c9
parent 5a9d74e7ad
1 changed files with 5 additions and 0 deletions
--- 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