commit b450568209c8ae270d26ee7fda2e4687ad8a5327
author Chris Rorvick <chris@rorvick.com> Sun Dec 02 21:27:51 2012 -0600
committer Junio C Hamano <gitster@pobox.com> Mon Dec 03 08:04:09 2012 -0800
tree 7141322da5346153ef97169966607c67ff078757
parent 1184564eac8ef6c82da068a31f60aee0d6870265

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>

advice.h

diff --git a/advice.h b/advice.h
index c28ef8a..8bf6356 100644
--- a/advice.h
+++ b/advice.h
@@ -7,6 +7,7 @@
 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;