From 1184564eac8ef6c82da068a31f60aee0d6870265 Mon Sep 17 00:00:00 2001 From: Chris Rorvick Date: Sun, 2 Dec 2012 21:27:50 -0600 Subject: 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 Signed-off-by: Junio C Hamano --- advice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'advice.h') diff --git a/advice.h b/advice.h index f3cdbbf29e..c28ef8ac23 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; -- cgit v1.2.3