Merge branch 'rr/rebase-checkout-reflog'

diff --git a/advice.c b/advice.c
index a8deee6e6419a1e867e06e90a70300cd2e01b556..2a52098a29dd1c2192edb6fff8ca6979383e77c6 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -14,6 +14,8 @@ 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;
@@ -33,6 +35,8 @@ static struct {
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
        { "setupstreamfailure", &advice_set_upstream_failure },
+       { "object_name_warning", &advice_object_name_warning },
+       { "rmhints", &advice_rm_hints },
 
        /* make this an alias for backward compatibility */
        { "pushnonfastforward", &advice_push_update_rejected }