diff options
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -13,6 +13,9 @@ 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; +int advice_rm_hints = 1; static struct { const char *name; @@ -31,6 +34,9 @@ static struct { { "resolveconflict", &advice_resolve_conflict }, { "implicitidentity", &advice_implicit_identity }, { "detachedhead", &advice_detached_head }, + { "setupstreamfailure", &advice_set_upstream_failure }, + { "objectnamewarning", &advice_object_name_warning }, + { "rmhints", &advice_rm_hints }, /* make this an alias for backward compatibility */ { "pushnonfastforward", &advice_push_update_rejected } |