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

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

projects / thirdparty / git.git / commit

author	Phillip Wood <phillip.wood@dunelm.org.uk>
	Tue, 16 Apr 2019 10:18:42 +0000 (11:18 +0100)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 17 Apr 2019 02:31:39 +0000 (11:31 +0900)
commit	4a72486de97b5c6b0979b2b51e50c268bdb0d4f6
tree	59f14e26ef0542b206a0e991f0a9ac7a582f466a	tree \| snapshot
parent	b07d9bfd171d881a02d110b68673c58cb63e9f62	commit \| diff

fix cherry-pick/revert status after commit

If the user commits a conflict resolution using `git commit` in the
middle of a sequence of cherry-picks/reverts then `git status` missed
the fact that a cherry-pick/revert is still in progress.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sequencer.c		diff \| blob \| blame \| history
sequencer.h		diff \| blob \| blame \| history
t/t7512-status-help.sh		diff \| blob \| blame \| history
wt-status.c		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom