summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
commitd97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch)
tree53941cdc41e6ad573859ee63c570499b869fc967 /advice.h
parentb4b8c35729985a8f1f5e22f82259a2499efbc37a (diff)
parentdcb500dc16ce8db556b51e9a5b3fa977111d0443 (diff)
downloadgit-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.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 940c4c2..d015404 100644
--- a/advice.h
+++ b/advice.h
@@ -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;