Merge branch 'jc/add-ita'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:21:25 +0000 (10:21 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:21:25 +0000 (10:21 -0700)
* jc/add-ita:
  git-add --intent-to-add (-N)

1  2 
cache.h
read-cache.c

diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge