Merge branch 'tk/interpret-trailers-in-place'
commit4f3aa9da7022c11c5db51b5b9063c0215863aba1
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:13 +0000 (28 16:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:13 +0000 (28 16:10 -0800)
tree10d42e9fc0874205bacf6c07ad8d7a070296b497
parent4b16573ce99c46e8c5b4950c44b70f1584b8dca9
parente1f898639e906158fec26bdf3111d6f623288fa1
Merge branch 'tk/interpret-trailers-in-place'

"interpret-trailers" has been taught to optionally update a file in
place, instead of always writing the result to the standard output.

* tk/interpret-trailers-in-place:
  interpret-trailers: add option for in-place editing
  trailer: allow to write to files other than stdout