diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-07-02 09:11:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-02 19:08:07 (GMT) |
| commit | 6a1f9046a40ad69eb00e5a83c6825972113f6e0f (patch) | |
| tree | b644c984dbca974f666a8c57745f04d6b147d80d /advice.c | |
| parent | a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682 (diff) | |
| download | git-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.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -15,6 +15,7 @@ int advice_status_u_option = 1; int advice_commit_before_merge = 1; int advice_reset_quiet_warning = 1; int advice_resolve_conflict = 1; +int advice_sequencer_in_use = 1; int advice_implicit_identity = 1; int advice_detached_head = 1; int advice_set_upstream_failure = 1; @@ -71,6 +72,7 @@ static struct { { "commitBeforeMerge", &advice_commit_before_merge }, { "resetQuiet", &advice_reset_quiet_warning }, { "resolveConflict", &advice_resolve_conflict }, + { "sequencerInUse", &advice_sequencer_in_use }, { "implicitIdentity", &advice_implicit_identity }, { "detachedHead", &advice_detached_head }, { "setupStreamFailure", &advice_set_upstream_failure }, |