kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint-1.7.0' into maint-1.7.1 

* maint-1.7.0:
  add: introduce add.ignoreerrors synonym for add.ignore-errors
maint
Junio C Hamano 2010-12-01 16:37:34 -08:00
parent 520ea857e6 6b3020a241
commit e760924cbe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -530,9 +530,13 @@ core.sparseCheckout::
linkgit:git-read-tree[1] for more information. linkgit:git-read-tree[1] for more information.


add.ignore-errors:: add.ignore-errors::
add.ignoreErrors::
Tells 'git add' to continue adding files when some files cannot be Tells 'git add' to continue adding files when some files cannot be
added due to indexing errors. Equivalent to the '--ignore-errors' 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.


alias.*:: alias.*::
Command aliases for the linkgit:git[1] command wrapper - e.g. Command aliases for the linkgit:git[1] command wrapper - e.g.

3
builtin/add.c
View File

@ -328,7 +328,8 @@ static struct option builtin_add_options[] = {


static int add_config(const char *var, const char *value, void *cb) 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); ignore_add_errors = git_config_bool(var, value);
return 0; return 0;
} }