Merge branch 'tf/string-list-init'

* tf/string-list-init:
  string_list: Add STRING_LIST_INIT macro and make use of it.

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/rerere.c
Simple merge

diff --cc merge-recursive.c
Simple merge