diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 03:40:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 03:40:26 +0300 |
| commit | 5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (patch) | |
| tree | 207af060fbb0f8ce50f93cd1cc8c73d049729ce1 /Documentation/config.txt | |
| parent | 16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff) | |
| parent | 2de132f8844f3b1b3c9f898e48829630d0cabb07 (diff) | |
Merge branch 'maint-1.7.2' into maint
* maint-1.7.2:
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 e6a8f27f26..3fd4b626fa 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -548,9 +548,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. |