X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=advice.c;h=a8deee6e6419a1e867e06e90a70300cd2e01b556;hb=ba5831fdae3d8c87ddeed9f78f2a9ff5d0a60b62;hp=3bc86260b8a2a809a379c91627f919ef0a529aa1;hpb=4aaafdc6f14b3ae79cd35158767d842b62eaad08;p=git-core%2Fgit.git

diff --git a/advice.c b/advice.c
index 3bc86260b..a8deee6e6 100644
--- a/advice.c
+++ b/advice.c
@@ -13,6 +13,7 @@ int advice_commit_before_merge = 1;
 int advice_resolve_conflict = 1;
 int advice_implicit_identity = 1;
 int advice_detached_head = 1;
+int advice_set_upstream_failure = 1;
 
 static struct {
 	const char *name;
@@ -31,6 +32,7 @@ static struct {
 	{ "resolveconflict", &advice_resolve_conflict },
 	{ "implicitidentity", &advice_implicit_identity },
 	{ "detachedhead", &advice_detached_head },
+	{ "setupstreamfailure", &advice_set_upstream_failure },
 
 	/* make this an alias for backward compatibility */
 	{ "pushnonfastforward", &advice_push_update_rejected }