summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-27 12:19:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-28 12:21:12 -0800
commit394e1505b8c359461c4b7cbbd204f86b185c64a0 (patch)
tree682198925b417a2dc4181bfc5f75a5cd7250201f
parentMerge branch 'maint-2.0' into maint-2.1 (diff)
downloadtgif-394e1505b8c359461c4b7cbbd204f86b185c64a0.tar.xz
config.txt: clarify that add.ignore-errors is deprecated
The old text gave an impression that even in a new repository using old form might be safer. Only Git from pre 1.7.0 days choke on the correctly named variable, which is ancient by today's standard. We have no intention to remove the support for deprecated ones, but let's make sure that we do not give room for confused questions such as "why does core.sparse-checkout not work, when add.ignore-errors does?" Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0a4d22aaf7..69f30d63c2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -664,14 +664,13 @@ core.abbrev::
for abbreviated object names to stay unique for sufficiently long
time.
-add.ignore-errors::
add.ignoreErrors::
+add.ignore-errors::
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]. 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.
+ option of linkgit:git-add[1]. `add.ignore-errors` is deprecated,
+ as it does not follow the usual naming convention for configuration
+ variables.
alias.*::
Command aliases for the linkgit:git[1] command wrapper - e.g.