OSDN Git Service

Merge branch 'pb/trailers-from-command-line'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:04 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:04 +0000 (22:55 -0700)
"git interpret-trailers" learned to take the trailer specifications
from the command line that overrides the configured values.

* pb/trailers-from-command-line:
  interpret-trailers: fix documentation typo
  interpret-trailers: add options for actions
  trailers: introduce struct new_trailer_item
  trailers: export action enums and corresponding lookup functions


Trivial merge