Junio C Hamano  committed e760924 Merge

Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
add: introduce add.ignoreerrors synonym for add.ignore-errors

  • Participants
  • Parent commits 520ea85, 6b3020a
  • Branches master

Comments (0)

Files changed (2)

File Documentation/config.txt

 	linkgit:git-read-tree[1] for more information.
 	Tells 'git add' to continue adding files when some files cannot be
 	added due to indexing errors. Equivalent to the '--ignore-errors'
-	option of linkgit:git-add[1].
+	option of linkgit:git-add[1].  Older versions of git accept only
+	`add.ignore-errors`, which does not follow the usual naming
+	convention for configuration variables.  Newer versions of git
+	honor `add.ignoreErrors` as well.
 	Command aliases for the linkgit:git[1] command wrapper - e.g.

File builtin/add.c

 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;