Merge branch 'cp/add-u-pathspec' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:21:42 +0000 (21:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:21:42 +0000 (21:21 -0700)
* cp/add-u-pathspec:
  test for add with non-existent pathspec
  git add -u: die on unmatched pathspec

1  2 
builtin-add.c

diff --cc builtin-add.c
Simple merge