Merge branch 'maint-1.7.1' into maint-1.7.2
commit2de132f8844f3b1b3c9f898e48829630d0cabb07
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:40:20 +0000 (1 16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 00:40:20 +0000 (1 16:40 -0800)
tree4db88964c7bea883c349e42e034a79cc48fc3cd0
parentbd40d252ec1ed2716ac9e6bbeab48b3b40bd0d58
parente760924cbeb19c6e45febdb31d9d6c95deaf2b43
Merge branch 'maint-1.7.1' into maint-1.7.2

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