Merge branch 'cc/interpret-trailers'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2014 19:25:30 +0000 (12:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2014 19:25:32 +0000 (12:25 -0700)
A new filter to programatically edit the tail end of the commit log
messages.

* cc/interpret-trailers:
Documentation: add documentation for 'git interpret-trailers'
trailer: add tests for commands in config file
trailer: execute command from 'trailer.<name>.command'
trailer: add tests for "git interpret-trailers"
trailer: add interpret-trailers command
trailer: put all the processing together and print
trailer: parse trailers from file or stdin
trailer: process command line trailer arguments
trailer: read and process config information
trailer: process trailers from input message and arguments
trailer: add data structures and basic functions

1  2 
.gitignore
Makefile
git.c
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
diff --cc git.c
Simple merge