summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorRohit Ashiwal <rohit.ashiwal265@gmail.com>2019-07-02 09:11:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-02 19:08:07 (GMT)
commit6a1f9046a40ad69eb00e5a83c6825972113f6e0f (patch)
treeb644c984dbca974f666a8c57745f04d6b147d80d /advice.h
parenta6a95cd1b46e48e5fe06bdbb0839a67ebeef4682 (diff)
downloadgit-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.zip
git-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.tar.gz
git-6a1f9046a40ad69eb00e5a83c6825972113f6e0f.tar.bz2
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>
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index e50f02c..ebc838d 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;