Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim

[~andy/git] / advice.c

diff --git a/advice.c b/advice.c
index 22abde9bc4edc5d90fa8e12e5e27654948955b23..54315cbd0a554bdeb1ace160a5df7cf6c485e559 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -8,10 +8,12 @@ int advice_push_already_exists = 1;
 int advice_push_fetch_first = 1;
 int advice_push_needs_force = 1;
 int advice_status_hints = 1;
+int advice_status_u_option = 1;
 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;
 int advice_object_name_warning = 1;
 
 static struct {
@@ -26,10 +28,12 @@ static struct {
        { "pushfetchfirst", &advice_push_fetch_first },
        { "pushneedsforce", &advice_push_needs_force },
        { "statushints", &advice_status_hints },
+       { "statusuoption", &advice_status_u_option },
        { "commitbeforemerge", &advice_commit_before_merge },
        { "resolveconflict", &advice_resolve_conflict },
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
+       { "setupstreamfailure", &advice_set_upstream_failure },
        { "object_name_warning", &advice_object_name_warning },
 
        /* make this an alias for backward compatibility */