![[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) |
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
| 1 | 2 | |||
|---|---|---|---|---|
| unpack-trees.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc unpack-trees.c
Simple merge