summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJosh Steadmon <steadmon@google.com>2021-08-30 21:46:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-30 23:35:36 (GMT)
commit767a4ca648f8791c1fb623bd9f79fd8d7f026499 (patch)
treea412a04463d6b0bb7e36fcdabe5512d539b89593 /advice.h
parent2d755dfac9aadab25c3e025b849252b8c0a61465 (diff)
downloadgit-767a4ca648f8791c1fb623bd9f79fd8d7f026499.zip
git-767a4ca648f8791c1fb623bd9f79fd8d7f026499.tar.gz
git-767a4ca648f8791c1fb623bd9f79fd8d7f026499.tar.bz2
sequencer: advise if skipping cherry-picked commit
Silently skipping commits when rebasing with --no-reapply-cherry-picks (currently the default behavior) can cause user confusion. Issue warnings when this happens, as well as advice on how to preserve the skipped commits. These warnings and advice are displayed only when using the (default) "merge" rebase backend. Update the git-rebase docs to mention the warnings and advice. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 9f8ffc7..4b4f574 100644
--- a/advice.h
+++ b/advice.h
@@ -35,6 +35,7 @@ extern int advice_checkout_ambiguous_remote_branch_name;
extern int advice_submodule_alternate_error_strategy_die;
extern int advice_add_ignored_file;
extern int advice_add_empty_pathspec;
+extern int advice_skipped_cherry_picks;
/*
* To add a new advice, you need to:
@@ -75,6 +76,7 @@ extern int advice_add_empty_pathspec;
ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
ADVICE_UPDATE_SPARSE_PATH,
ADVICE_WAITING_FOR_EDITOR,
+ ADVICE_SKIPPED_CHERRY_PICKS,
};
int git_default_advice_config(const char *var, const char *value);