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 /Documentation/config.txt | |
| 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 'Documentation/config.txt')
| -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 6a6c0b5bd..6b7279f88 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -554,9 +554,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. |