aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:20 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:20 -0800
commit2de132f8844f3b1b3c9f898e48829630d0cabb07 (patch)
tree4db88964c7bea883c349e42e034a79cc48fc3cd0 /builtin
parentbd40d252ec1ed2716ac9e6bbeab48b3b40bd0d58 (diff)
parente760924cbeb19c6e45febdb31d9d6c95deaf2b43 (diff)
downloadgit-2de132f8844f3b1b3c9f898e48829630d0cabb07.tar.gz
git-2de132f8844f3b1b3c9f898e48829630d0cabb07.tar.xz
Merge branch 'maint-1.7.1' into maint-1.7.2
* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
Diffstat (limited to 'builtin')
-rw-r--r--builtin/add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 56a4e0af6..3a5fca515 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -331,7 +331,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;
}