user-manual: Document that "git merge" doesn't like uncommited changes.
[git/dscho.git] / advice.c
blobcb666acc3cf8fdda777febbefac455f3667759f1
1 #include "cache.h"
3 int advice_push_nonfastforward = 1;
4 int advice_status_hints = 1;
5 int advice_commit_before_merge = 1;
7 static struct {
8 const char *name;
9 int *preference;
10 } advice_config[] = {
11 { "pushnonfastforward", &advice_push_nonfastforward },
12 { "statushints", &advice_status_hints },
13 { "commitbeforemerge", &advice_commit_before_merge },
16 int git_default_advice_config(const char *var, const char *value)
18 const char *k = skip_prefix(var, "advice.");
19 int i;
21 for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
22 if (strcmp(k, advice_config[i].name))
23 continue;
24 *advice_config[i].preference = git_config_bool(var, value);
25 return 0;
28 return 0;