git.99rst.org Git - git.git/commit

author	Rohit Ashiwal <redacted>
	Tue, 2 Jul 2019 09:11:25 +0000 (14:41 +0530)
committer	Junio C Hamano <redacted>
	Tue, 2 Jul 2019 19:08:07 +0000 (12:08 -0700)
commit	6a1f9046a40ad69eb00e5a83c6825972113f6e0f
tree	b644c984dbca974f666a8c57745f04d6b147d80d	tree \| snapshot
parent	a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682	commit \| diff

sequencer: add advice for revert

In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --<sequencer-options>`.
Introduce a separate advice message for `git revert`. Also change
the signature of `create_seq_dir` to handle which advice to display
selectively.

Signed-off-by: Rohit Ashiwal <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/config/advice.txt		diff \| blob \| history
advice.c		diff \| blob \| history
advice.h		diff \| blob \| history
sequencer.c		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT