Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
commit7013220d2b3181d4ae55e21e0f18b9abfd6e011d
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jun 2016 17:37:48 +0000 (13 10:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jun 2016 17:37:48 +0000 (13 10:37 -0700)
tree4ceb8a1c5dd10047c7d9b59a30e9687cc7fc8372
parente059388fb200fb2b5281ce211242ef3525a9c2c7
parent64093fc06a871f71316211a2aea6bb46c49b20ab
Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init

* jk/parseopt-string-list:
  blame,shortlog: don't make local option variables static
  interpret-trailers: don't duplicate option strings
  parse_opt_string_list: stop allocating new strings
builtin/blame.c
builtin/interpret-trailers.c
builtin/shortlog.c
parse-options-cb.c