diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:41:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:41:13 -0800 |
| commit | 94fdb6f6ebcfe2842e8648dd88389e2e850723e9 (patch) | |
| tree | 62d85d3339367019cb23c3c6d99e6aae0e8c6945 /builtin | |
| parent | df5d43be1f721b0ede37097b815463ceb43b0449 (diff) | |
| parent | 5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (diff) | |
| download | git-94fdb6f6ebcfe2842e8648dd88389e2e850723e9.tar.gz git-94fdb6f6ebcfe2842e8648dd88389e2e850723e9.tar.xz | |
Merge branch 'maint'
* maint:
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 71f9b04fe..21dc1f733 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; } |