diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:40:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:40:20 -0800 |
| commit | 2de132f8844f3b1b3c9f898e48829630d0cabb07 (patch) | |
| tree | 4db88964c7bea883c349e42e034a79cc48fc3cd0 | |
| parent | bd40d252ec1ed2716ac9e6bbeab48b3b40bd0d58 (diff) | |
| parent | e760924cbeb19c6e45febdb31d9d6c95deaf2b43 (diff) | |
| download | git-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
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | builtin/add.c | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1df0f654e..5506e3131 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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. 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; } |