]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sn/rebase-update-refs-symrefs' into seen
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2026 23:14:09 +0000 (08:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2026 23:14:10 +0000 (08:14 +0900)
"git rebase --update-refs" has been taught to resolve local branch
symrefs to their referents before queuing updates. This correctly
skips aliases of the current branch and avoids duplicate updates for
underlying real branches, fixing failures when branch aliases (like a
default branch rename) are present.

* sn/rebase-update-refs-symrefs:
  rebase: skip branch symref aliases

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge