summaryrefslogtreecommitdiff
path: root/builtin/add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-01 16:37:34 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-01 16:37:34 -0800
commite760924cbeb19c6e45febdb31d9d6c95deaf2b43 (patch)
tree4f426511d6a035ab97addf72b5fddeba7c23d3e3 /builtin/add.c
parent520ea857e66f25a681401fd534b2f0d099fd2d31 (diff)
parent6b3020a241e2c0a1eaa6b74a10a796603bb90975 (diff)
downloadgit-e760924cbeb19c6e45febdb31d9d6c95deaf2b43.tar.gz
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors
Diffstat (limited to 'builtin/add.c')
-rw-r--r--builtin/add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 87d2980313..51eeabad86 100644
--- 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;
}