Code

Merge branch 'nd/cache-tree-api-refactor'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:42 +0000 (22:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:42:42 +0000 (22:42 -0800)
* nd/cache-tree-api-refactor:
  cache-tree: update API to take abitrary flags

1  2 
builtin/commit.c
cache-tree.c

Simple merge
diff --cc cache-tree.c
Simple merge