![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Dec 2008 08:38:12 +0000 (00:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Dec 2008 08:38:12 +0000 (00:38 -0800) | ||
| commit | ae26e7c74970281bd3597c79e44a8b54a927bbe1 | |
| tree | ab91c9e9de975fd469f81795a5f53026050b2b71 | tree | snapshot |
| parent | 6dbcb59e8271c16cbec486932bd3069279e09c60 | commit | diff |
| parent | 331fcb598ec0127fd89c992361bc573dcd3a4a63 | commit | diff |
Merge branch 'jc/rm-i-t-a'
* jc/rm-i-t-a:
git add --intent-to-add: do not let an empty blob be committed by accident
git add --intent-to-add: fix removal of cached emptiness
builtin-rm.c: explain and clarify the "local change" logic
Extend index to save more flags
* jc/rm-i-t-a:
git add --intent-to-add: do not let an empty blob be committed by accident
git add --intent-to-add: fix removal of cached emptiness
builtin-rm.c: explain and clarify the "local change" logic
Extend index to save more flags