summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-12-03 03:27:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-03 16:04:08 (GMT)
commit1184564eac8ef6c82da068a31f60aee0d6870265 (patch)
tree72309ffafe3d453c9ea44cc3d3691338bcbd942a /advice.h
parenta272b2896dcfd2758e97e0f35cb14df4436d7101 (diff)
downloadgit-1184564eac8ef6c82da068a31f60aee0d6870265.zip
git-1184564eac8ef6c82da068a31f60aee0d6870265.tar.gz
git-1184564eac8ef6c82da068a31f60aee0d6870265.tar.bz2
push: rename config variable for more general use
The 'pushNonFastForward' advice config can be used to squelch several instances of push-related advice. Rename it to 'pushUpdateRejected' to cover other reject scenarios that are unrelated to fast-forwarding. Retain the old name for compatibility. 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/advice.h b/advice.h
index f3cdbbf..c28ef8a 100644
--- a/advice.h
+++ b/advice.h
@@ -3,7 +3,7 @@
#include "git-compat-util.h"
-extern int advice_push_nonfastforward;
+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;