From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Jun 2010 18:21:11 +0000 (-0700)
Subject: Merge branch 'cb/assume-unchanged-fix'
X-Git-Tag: v1.7.2-rc0~83
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=40e9b27dec28692464f43d1c213d465fed8994ba;p=git.git

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"
---

40e9b27dec28692464f43d1c213d465fed8994ba