summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-10 18:46:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-10 18:46:19 (GMT)
commit6c083b7619f171d32df633ca0281653afabd788f (patch)
tree1b1284680cfdfdee92314da6ea0978658bef24b1 /advice.h
parent8463beaeb69fe0b7f651065813def4aa6827cd5d (diff)
parent767a4ca648f8791c1fb623bd9f79fd8d7f026499 (diff)
downloadgit-6c083b7619f171d32df633ca0281653afabd788f.zip
git-6c083b7619f171d32df633ca0281653afabd788f.tar.gz
git-6c083b7619f171d32df633ca0281653afabd788f.tar.bz2
Merge branch 'js/advise-when-skipping-cherry-picked'
"git rebase" by default skips changes that are equivalent to commits that are already in the history the branch is rebased onto; give messages when this happens to let the users be aware of skipped commits, and also teach them how to tell "rebase" to keep duplicated changes. * js/advise-when-skipping-cherry-picked: sequencer: advise if skipping cherry-picked commit
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 a7227ca..3c28219 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);