summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-12-02 21:27:51 -0600
committerJunio C Hamano <gitster@pobox.com>2012-12-03 08:04:09 -0800
commitb450568209c8ae270d26ee7fda2e4687ad8a5327 (patch)
tree7141322da5346153ef97169966607c67ff078757 /advice.h
parent1184564eac8ef6c82da068a31f60aee0d6870265 (diff)
downloadgit-b450568209c8ae270d26ee7fda2e4687ad8a5327.tar.gz
push: allow already-exists advice to be disabled
Add 'advice.pushAlreadyExists' option to disable the advice shown when an update is rejected for a reference that is not allowed to update at all (verses those that are allowed to fast-forward.) Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 c28ef8ac23..8bf63563a5 100644
--- a/advice.h
+++ b/advice.h
@@ -7,6 +7,7 @@ extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
+extern int advice_push_already_exists;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;