tree 4f426511d6a035ab97addf72b5fddeba7c23d3e3
parent 520ea857e66f25a681401fd534b2f0d099fd2d31
parent 6b3020a241e2c0a1eaa6b74a10a796603bb90975
author Junio C Hamano <gitster@pobox.com> 1291250254 -0800
committer Junio C Hamano <gitster@pobox.com> 1291250254 -0800

Merge branch 'maint-1.7.0' into maint-1.7.1

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