Merge branch 'tf/string-list-init'
commit6b5005c88b3a0c360249deb8ca8b92201abaa824
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:04 +0000 (18 12:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:47:04 +0000 (18 12:47 -0700)
tree177a02c572549b4caa5872ef3ecd4275e860b5af
parent165dc789d5e201a06e0de5a984e4529ae62027fc
parent183113a5ca99cb228b2ba0a29e53f1ac11f2c7c2
Merge branch 'tf/string-list-init'

* tf/string-list-init:
  string_list: Add STRING_LIST_INIT macro and make use of it.
builtin/fetch.c
builtin/grep.c
builtin/rerere.c
merge-recursive.c