Merge branch 'jc/add-n-u'
commit0166592495e21b075fa48225ff21568269bf51d4
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 21:03:50 +0000 (25 14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 21:03:50 +0000 (25 14:03 -0700)
tree21c295f211ad2aeaa798222e7c5564f17a90a429
parent488ee2fe21ca69b90aa2b43dc9e30279a12cca63
parent205ffa94be8f6492eef4bdaa3315e7fdc7e64e0b
Merge branch 'jc/add-n-u'

* jc/add-n-u:
  Make git add -n and git -u -n output consistent
  "git-add -n -u" should not add but just report

Conflicts:

builtin-add.c
builtin-mv.c
cache.h
read-cache.c
builtin-add.c
builtin-mv.c
cache.h
read-cache.c