diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:37:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:37:34 -0800 |
| commit | e760924cbeb19c6e45febdb31d9d6c95deaf2b43 (patch) | |
| tree | 4f426511d6a035ab97addf72b5fddeba7c23d3e3 /Documentation | |
| parent | t0003: add missing && at end of lines (diff) | |
| parent | add: introduce add.ignoreerrors synonym for add.ignore-errors (diff) | |
| download | tgif-e760924cbeb19c6e45febdb31d9d6c95deaf2b43.tar.xz | |
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0:
add: introduce add.ignoreerrors synonym for add.ignore-errors
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index eae06e7c3e..6a07fe60e7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -530,9 +530,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. |