Merge branch 'maint-1.7.1' into maint-1.7.2
* maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors
This commit is contained in:
commit
2de132f884
@ -539,9 +539,13 @@ core.sparseCheckout::
|
||||
linkgit:git-read-tree[1] for more information.
|
||||
|
||||
add.ignore-errors::
|
||||
add.ignoreErrors::
|
||||
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.
|
||||
|
||||
alias.*::
|
||||
Command aliases for the linkgit:git[1] command wrapper - e.g.
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user