tree 4db88964c7bea883c349e42e034a79cc48fc3cd0
parent bd40d252ec1ed2716ac9e6bbeab48b3b40bd0d58
parent e760924cbeb19c6e45febdb31d9d6c95deaf2b43
author Junio C Hamano <gitster@pobox.com> 1291250420 -0800
committer Junio C Hamano <gitster@pobox.com> 1291250420 -0800

Merge branch 'maint-1.7.1' into maint-1.7.2

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