]> git.ipfire.org Git - thirdparty/git.git/commit - advice.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a6a95cd) | patch
sequencer: add advice for revert
authorRohit Ashiwal <rohit.ashiwal265@gmail.com>
Tue, 2 Jul 2019 09:11:25 +0000 (14:41 +0530)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2019 19:08:07 +0000 (12:08 -0700)
commit6a1f9046a40ad69eb00e5a83c6825972113f6e0f
treeb644c984dbca974f666a8c57745f04d6b147d80dtree | snapshot
parenta6a95cd1b46e48e5fe06bdbb0839a67ebeef4682commit | 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 <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config/advice.txt diff | blob | blame | history
advice.c diff | blob | blame | history
advice.h diff | blob | blame | history
sequencer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.