summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:40:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-01 16:40:20 -0800
commit2de132f8844f3b1b3c9f898e48829630d0cabb07 (patch)
tree4db88964c7bea883c349e42e034a79cc48fc3cd0 /Documentation
parentbash: Match lightweight tags in prompt (diff)
parentMerge branch 'maint-1.7.0' into maint-1.7.1 (diff)
downloadtgif-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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1df0f654e6..5506e31318 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.