![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 22:15:40 +0000 (14:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Nov 2007 22:15:40 +0000 (14:15 -0800) | ||
| commit | c78a24986d4d3faff810e87dbcd0ac99f0eabbce | |
| tree | 29ceb2cf66c2454949d42dae7d8a70cb8f87d70e | tree | snapshot |
| parent | ef4de8357dff57d403073572e8b260618bd03175 | commit | diff |
| parent | 25487bde2ab756a423489fc942b37c1550555b93 | commit | diff |
Merge branch 'jc/maint-add-sync-stat'
* jc/maint-add-sync-stat:
t2200: test more cases of "add -u"
git-add: make the entry stat-clean after re-adding the same contents
ce_match_stat, run_diff_files: use symbolic constants for readability
Conflicts:
builtin-add.c
* jc/maint-add-sync-stat:
t2200: test more cases of "add -u"
git-add: make the entry stat-clean after re-adding the same contents
ce_match_stat, run_diff_files: use symbolic constants for readability
Conflicts:
builtin-add.c
| builtin-add.c | diff1 | | diff2 | | blob | history |
| builtin-apply.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| entry.c | diff1 | | diff2 | | blob | history |
| read-cache.c | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |