]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rj/status-bisect-while-rebase'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:29 +0000 (13:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jan 2024 21:51:29 +0000 (13:51 -0800)
"git status" is taught to show both the branch being bisected and
being rebased when both are in effect at the same time.

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

1  2 
branch.c
ref-filter.c
t/t7512-status-help.sh
worktree.c
wt-status.c

diff --cc branch.c
Simple merge
diff --cc ref-filter.c
Simple merge
Simple merge
diff --cc worktree.c
Simple merge
diff --cc wt-status.c
Simple merge