]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f7cc56 990adcc)
Merge branch 'rj/status-bisect-while-rebase' into maint-2.43
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:04 +0000 (16:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:04 +0000 (16:22 -0800)
commita593e2fbce8e66663b9e1f4f6377f2579879d1fd
tree00e826ff71ad957cbd67d0144adc25bf4190d4d6tree | snapshot
parent8f7cc565e002450e8e2d3404e227cdce5555cb2dcommit | diff
parent990adccbdf0d8d1056c49a5ed546e744f542ba8fcommit | diff
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
branch.c diff1 | diff2 | blob | history
ref-filter.c diff1 | diff2 | blob | history
t/t7512-status-help.sh diff1 | diff2 | blob | history
worktree.c diff1 | diff2 | blob | history
wt-status.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.