Merge branch 'maint' to sync with 1.5.2.5
commitc576304d512df18fa30b91bb3ac15478d5d4dfb1
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (15 21:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Aug 2007 04:38:38 +0000 (15 21:38 -0700)
treea0be3b2ce5c20da4468433dfa6357c5357951e6f
parentf34f2b0b384b42f7a0d0d92966c145b05fe55217
parentb13ef4916ac5a25cc5897f85ba0b4c5953cff609
Merge branch 'maint' to sync with 1.5.2.5

* maint:
  GIT 1.5.2.5
  git-add -u paths... now works from subdirectory
  Fix "git add -u" data corruption.
builtin-add.c
t/t2200-add-update.sh