diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
commit | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch) | |
tree | 53941cdc41e6ad573859ee63c570499b869fc967 /advice.h | |
parent | Merge branch 'tb/ref-filter-multiple-patterns' (diff) | |
parent | cherry-pick/revert: advise using --skip (diff) | |
download | tgif-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.xz |
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.h')
-rw-r--r-- | advice.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -17,6 +17,7 @@ extern int advice_status_ahead_behind_warning; 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; |