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)
commitbfd91b41341cb922aa1ba6e7c01ccd5ebb81cf41
tree8309adc9af63683b18c6c30c8ee4a4d74fc567dc
parent0b9635847944f97079fc6c2283063cd3a0ed0271
parentc88bf5436d84762a474048a0a57409a8f2fa2c6b
Merge branch 'pb/trailers-from-command-line'

"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