diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 18:30:21 (GMT) |
| commit | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch) | |
| tree | 53941cdc41e6ad573859ee63c570499b869fc967 /advice.c | |
| parent | b4b8c35729985a8f1f5e22f82259a2499efbc37a (diff) | |
| parent | dcb500dc16ce8db556b51e9a5b3fa977111d0443 (diff) | |
| download | git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.zip git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.gz git-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.bz2 | |
Merge branch 'ra/cherry-pick-revert-skip'
"git cherry-pick/revert" learned a new "--skip" action.
* ra/cherry-pick-revert-skip:
cherry-pick/revert: advise using --skip
cherry-pick/revert: add --skip option
sequencer: use argv_array in reset_merge
sequencer: rename reset_for_rollback to reset_merge
sequencer: add advice for revert
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -17,6 +17,7 @@ int advice_status_ahead_behind_warning = 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; @@ -75,6 +76,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 }, |