Use "git merge" instead of "git pull ."

diff --git a/advice.c b/advice.c
index a4c169ca382bd8265965f8fab6a961ffa8e7dcd2..3eca9f5ffdd6e3596584ed0aa79e2634683bd496 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -14,6 +14,7 @@ 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 {
@@ -34,6 +35,7 @@ static struct {
        { "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 */