Merge branch 'cb/assume-unchanged-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700)
commit40e9b27dec28692464f43d1c213d465fed8994ba
treedb57c8cf1c828d4ac08fc0d717995869b7f6c07d
parent95e42a64a9e713bcc3c4590fb933c93d37342322
parentac472ba65f75fbdbc52328f2bdc8645e5289e683
Merge branch 'cb/assume-unchanged-fix'

* cb/assume-unchanged-fix:
  Documentation: git-add does not update files marked "assume unchanged"
  do not overwrite files marked "assume unchanged"
unpack-trees.c