aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-27 00:41:15 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-29 02:05:06 -0700
commit7c1c6782e0b88c9366c575fd47e48050070afdd3 (patch)
tree141a31e6d2af4097fbfaaedb754cea425a835cba /Makefile
parent093dc5bee61c47f5b0f3bea04339c9bf8839ca47 (diff)
downloadgit-7c1c6782e0b88c9366c575fd47e48050070afdd3.tar.gz
git-7c1c6782e0b88c9366c575fd47e48050070afdd3.tar.xz
Split out mailmap handling out of shortlog
This splits out a few functions to deal with mailmap from shortlog and makes it a bit more usable from other programs. Most notably, it does not clobber input e-mail address anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 60c41fd0d..85c0a7542 100644
--- a/Makefile
+++ b/Makefile
@@ -288,7 +288,7 @@ LIB_H = \
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
- utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h
+ utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
DIFF_OBJS = \
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@ -310,7 +310,7 @@ LIB_OBJS = \
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
- convert.o attr.o decorate.o progress.o
+ convert.o attr.o decorate.o progress.o mailmap.o
BUILTIN_OBJS = \
builtin-add.o \