Merge branch 'mg/add-ignore-errors' into maint
commitd0879b33a6c34285a870e351e8eaee5cd695e92d
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:02:19 +0000 (12 14:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 22:02:19 +0000 (12 14:02 -0800)
tree17df01c0a750aabdc9ec86e40921a2c37597b48b
parentefc028b1f2c6da6558094326083f7643453bfccd
parent1d31e5a2cd9f90799330d5095783e7b972357f0e
Merge branch 'mg/add-ignore-errors' into maint

* mg/add-ignore-errors:
  add: ignore only ignored files