From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 12:39:23 +0000 (-0700)
Subject: Merge branch 'cb/assume-unchanged-fix' into maint
X-Git-Tag: v1.7.2-rc0~38^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=443f26cbcac66368eb0ec8a8a250bf5815ad0a10;p=thirdparty%2Fgit.git

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

443f26cbcac66368eb0ec8a8a250bf5815ad0a10