From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Feb 2024 00:22:04 +0000 (-0800)
Subject: Merge branch 'rj/status-bisect-while-rebase' into maint-2.43
X-Git-Tag: v2.43.1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a593e2fbce8e66663b9e1f4f6377f2579879d1fd;p=thirdparty%2Fgit.git

Merge branch 'rj/status-bisect-while-rebase' into maint-2.43

"git status" is taught to show both the branch being bisected and
being rebased when both are in effect at the same time.
cf. <xmqqil76kyov.fsf@gitster.g>

* rj/status-bisect-while-rebase:
  status: fix branch shown when not only bisecting
---

a593e2fbce8e66663b9e1f4f6377f2579879d1fd