Merge branch 'nd/struct-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:06 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:06 +0000 (10:50 -0700)
* nd/struct-pathspec:
  pathspec: rename per-item field has_wildcard to use_wildcard
  Improve tree_entry_interesting() handling code
  Convert read_tree{,_recursive} to support struct pathspec
  Reimplement read_tree_recursive() using tree_entry_interesting()

1  2 
builtin/checkout.c
builtin/grep.c
builtin/log.c
cache.h
dir.c
list-objects.c
merge-recursive.c
tree-diff.c

Simple merge
diff --cc builtin/grep.c
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc dir.c
Simple merge
diff --cc list-objects.c
Simple merge
Simple merge
diff --cc tree-diff.c
Simple merge