From 6a1f9046a40ad69eb00e5a83c6825972113f6e0f Mon Sep 17 00:00:00 2001 From: Rohit Ashiwal Date: Tue, 2 Jul 2019 14:41:25 +0530 Subject: sequencer: add advice for revert In the case of merge conflicts, while performing a revert, we are currently advised to use `git cherry-pick --`. 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 Signed-off-by: Junio C Hamano --- advice.h | 1 + 1 file changed, 1 insertion(+) (limited to 'advice.h') diff --git a/advice.h b/advice.h index e50f02cdfe..ebc838d7bc 100644 --- a/advice.h +++ b/advice.h @@ -15,6 +15,7 @@ extern int advice_status_u_option; extern int advice_commit_before_merge; extern int advice_reset_quiet_warning; extern int advice_resolve_conflict; +extern int advice_sequencer_in_use; extern int advice_implicit_identity; extern int advice_detached_head; extern int advice_set_upstream_failure; -- cgit v1.2.3