Merge branch 'maint-1.7.0' into maint-1.7.1

diff --git a/builtin/add.c b/builtin/add.c
index 87d2980313e71afc08df3eacde4a99a8468ff874..51eeabad867ee1e271d07d41dcb031e2c98cbf9f 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -328,7 +328,8 @@ static struct option builtin_add_options[] = {
 
 static int add_config(const char *var, const char *value, void *cb)
 {
-       if (!strcasecmp(var, "add.ignore-errors")) {
+       if (!strcasecmp(var, "add.ignoreerrors") ||
+           !strcasecmp(var, "add.ignore-errors")) {
                ignore_add_errors = git_config_bool(var, value);
                return 0;
        }