diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:40:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:40:26 -0800 |
| commit | 5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (patch) | |
| tree | 207af060fbb0f8ce50f93cd1cc8c73d049729ce1 /builtin | |
| parent | 16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff) | |
| parent | 2de132f8844f3b1b3c9f898e48829630d0cabb07 (diff) | |
| download | git-5501bf854ce6a3847ef0de6f6aa63f6b93e82b67.tar.gz git-5501bf854ce6a3847ef0de6f6aa63f6b93e82b67.tar.xz | |
Merge branch 'maint-1.7.2' into maint
* maint-1.7.2:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |