Merge branch 'jc/maint-branch-mergeoptions' into maint

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 7eebbefe7b6f665a8f6a5003eb37d7bcb3c196bd..35cb5d3f643905d124445ecdae3d2949ac0067a6 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -134,6 +134,8 @@ subdirectories.
        If some files could not be added because of errors indexing
        them, do not abort the operation, but continue adding the
        others. The command shall still exit with non-zero status.
+       The configuration variable `add.ignoreErrors` can be set to
+       true to make this the default behaviour.
 
 --ignore-missing::
        This option can only be used together with --dry-run. By using