Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
  add: introduce add.ignoreerrors synonym for add.ignore-errors

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/add.c
Simple merge