From: Taylor Blau <me@ttaylorr.com>
Date: Fri, 18 Oct 2024 17:56:22 +0000 (-0400)
Subject: Merge branch 'ng/rebase-merges-branch-name-as-label'
X-Git-Tag: v2.48.0-rc0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe1b8cee0c053d8dbfabaaecd6a09adae9f863d;p=thirdparty%2Fgit.git

Merge branch 'ng/rebase-merges-branch-name-as-label'

"git rebase --rebase-merges" now uses branch names as labels when
able.

* ng/rebase-merges-branch-name-as-label:
  rebase-merges: try and use branch names as labels
  rebase-update-refs: extract load_branch_decorations
  load_branch_decorations: fix memory leak with non-static filters
---

6fe1b8cee0c053d8dbfabaaecd6a09adae9f863d