Code

Merge branch 'maint' to sync with 1.5.2.5
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (21:38 -0700)
* maint:
  GIT 1.5.2.5
  git-add -u paths... now works from subdirectory
  Fix "git add -u" data corruption.

1  2 
builtin-add.c
t/t2200-add-update.sh

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