3 int advice_push_nonfastforward
= 1;
4 int advice_status_hints
= 1;
5 int advice_commit_before_merge
= 1;
6 int advice_resolve_conflict
= 1;
7 int advice_implicit_identity
= 1;
8 int advice_detached_head
= 1;
14 { "pushnonfastforward", &advice_push_nonfastforward
},
15 { "statushints", &advice_status_hints
},
16 { "commitbeforemerge", &advice_commit_before_merge
},
17 { "resolveconflict", &advice_resolve_conflict
},
18 { "implicitidentity", &advice_implicit_identity
},
19 { "detachedhead", &advice_detached_head
},
22 int git_default_advice_config(const char *var
, const char *value
)
24 const char *k
= skip_prefix(var
, "advice.");
27 for (i
= 0; i
< ARRAY_SIZE(advice_config
); i
++) {
28 if (strcmp(k
, advice_config
[i
].name
))
30 *advice_config
[i
].preference
= git_config_bool(var
, value
);
37 void NORETURN
die_resolve_conflict(const char *me
)
39 if (advice_resolve_conflict
)
41 * Message used both when 'git commit' fails and when
42 * other commands doing a merge do.
44 die("'%s' is not possible because you have unmerged files.\n"
45 "Please, fix them up in the work tree, and then use 'git add/rm <file>' as\n"
46 "appropriate to mark resolution and make a commit, or use 'git commit -a'.", me
);
48 die("'%s' is not possible because you have unmerged files.", me
);