Code

Merge branch 'cb/assume-unchanged-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700)
commit443f26cbcac66368eb0ec8a8a250bf5815ad0a10
tree0363e0e85d5009e9e042b4d22410c6d95373d805
parent1b9fa0e81134df5c067efc1e3413f05c9e5043f8
parentac472ba65f75fbdbc52328f2bdc8645e5289e683
Merge branch 'cb/assume-unchanged-fix' into maint

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