From c0eb09f1c95865ec58cf4825e635c28420240352 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Tue, 17 Jan 2023 17:53:54 +0100 Subject: [PATCH] git: rebase with updateRefs --- .gitconfig | 5 +++++ 1 file changed, 5 insertions(+) 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