summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-20 19:25:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-20 19:25:32 (GMT)
commit9d04401ffe18138138e8f765c2bb31420f3efe25 (patch)
treed26e9823fb98bac3245a1b174d87cb58ae12ba80 /Makefile
parent7df3b072a90f77f7fd82c493659e1b1160db5658 (diff)
parentdfd66ddf5aa9aacc06ed38a9ee2cc15a4f2d4896 (diff)
downloadgit-9d04401ffe18138138e8f765c2bb31420f3efe25.zip
git-9d04401ffe18138138e8f765c2bb31420f3efe25.tar.gz
git-9d04401ffe18138138e8f765c2bb31420f3efe25.tar.bz2
Merge branch 'cc/interpret-trailers'
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 356feb5..fcd51ac 100644
--- a/Makefile
+++ b/Makefile
@@ -764,6 +764,7 @@ LIB_OBJS += submodule.o
LIB_OBJS += symlinks.o
LIB_OBJS += tag.o
LIB_OBJS += trace.o
+LIB_OBJS += trailer.o
LIB_OBJS += transport.o
LIB_OBJS += transport-helper.o
LIB_OBJS += tree-diff.o
@@ -828,6 +829,7 @@ BUILTIN_OBJS += builtin/hash-object.o
BUILTIN_OBJS += builtin/help.o
BUILTIN_OBJS += builtin/index-pack.o
BUILTIN_OBJS += builtin/init-db.o
+BUILTIN_OBJS += builtin/interpret-trailers.o
BUILTIN_OBJS += builtin/log.o
BUILTIN_OBJS += builtin/ls-files.o
BUILTIN_OBJS += builtin/ls-remote.o