Merge branch 'maint-1.7.1' into maint-1.7.2

* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
2010-12-01 16:40:20 -08:00
parent bd40d252ec e760924cbe
commit 2de132f884
2 changed files with 7 additions and 2 deletions
--- 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;
 	}