git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Junio C Hamano <gitster@pobox.com>
	Tue, 2 Jan 2024 21:51:29 +0000 (13:51 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 2 Jan 2024 21:51:29 +0000 (13:51 -0800)
commit	cce4778520b6ade4bc839fe054500253f7d22570
tree	56e9458171772e6730ec578d8c237ab034284218	tree \| snapshot
parent	59a29e1274948bf9a3ef44c65903d09194464e1c	commit \| diff
parent	990adccbdf0d8d1056c49a5ed546e744f542ba8f	commit \| diff

Merge branch 'rj/status-bisect-while-rebase'

"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

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.

RSS Atom

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