![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Jun 2010 12:39:23 +0000 (05:39 -0700) | ||
| commit | 443f26cbcac66368eb0ec8a8a250bf5815ad0a10 | |
| tree | 0363e0e85d5009e9e042b4d22410c6d95373d805 | tree | snapshot |
| parent | 1b9fa0e81134df5c067efc1e3413f05c9e5043f8 | commit | diff |
| parent | ac472ba65f75fbdbc52328f2bdc8645e5289e683 | commit | diff |
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"
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"