![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jun 2010 18:21:11 +0000 (11:21 -0700) | ||
| commit | 40e9b27dec28692464f43d1c213d465fed8994ba | |
| tree | db57c8cf1c828d4ac08fc0d717995869b7f6c07d | tree | snapshot |
| parent | 95e42a64a9e713bcc3c4590fb933c93d37342322 | commit | diff |
| parent | ac472ba65f75fbdbc52328f2bdc8645e5289e683 | commit | diff |
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"
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
| unpack-trees.c | diff1 | | diff2 | | blob | history |