From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Dec 2008 08:38:12 +0000 (-0800)
Subject: Merge branch 'jc/rm-i-t-a'
X-Git-Tag: v1.6.1-rc2~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ae26e7c74970281bd3597c79e44a8b54a927bbe1;p=git.git

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
---

ae26e7c74970281bd3597c79e44a8b54a927bbe1