Merge branch 'maint-1.7.0' into maint-1.7.1
commite760924cbeb19c6e45febdb31d9d6c95deaf2b43
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:37:34 +0000 (1 16:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:37:34 +0000 (1 16:37 -0800)
tree4f426511d6a035ab97addf72b5fddeba7c23d3e3
parent520ea857e66f25a681401fd534b2f0d099fd2d31
parent6b3020a241e2c0a1eaa6b74a10a796603bb90975
Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
  add: introduce add.ignoreerrors synonym for add.ignore-errors
Documentation/config.txt
builtin/add.c