summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:41:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:41:13 -0800
commit94fdb6f6ebcfe2842e8648dd88389e2e850723e9 (patch)
tree62d85d3339367019cb23c3c6d99e6aae0e8c6945 /builtin
parentcommit.c: Remove backward goto in read_craft_line() (diff)
parentMerge branch 'maint-1.7.2' into maint (diff)
downloadtgif-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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 71f9b04fef..21dc1f7339 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;
}