Merge branch 'maint-1.7.0' into maint-1.7.1
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)
* maint-1.7.0:
  add: introduce add.ignoreerrors synonym for add.ignore-errors

1  2 
Documentation/config.txt
builtin/add.c

Simple merge
diff --cc builtin/add.c
Simple merge