summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-28 15:50:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-28 15:50:05 -0700
commit56a1d9ca6b069b707f2f728bf74cd928bfa2a88e (patch)
tree96d8f32a2df31328b93fe828e90d44ba841cc111 /Makefile
parentMerge branch 'jx/atomic-push' (diff)
parentLib-ify prune-packed (diff)
downloadtgif-56a1d9ca6b069b707f2f728bf74cd928bfa2a88e.tar.xz
Merge branch 'dl/libify-a-few'
Code in builtin/*, i.e. those can only be called from within built-in subcommands, that implements bulk of a couple of subcommands have been moved to libgit.a so that they could be used by others. * dl/libify-a-few: Lib-ify prune-packed Lib-ify fmt-merge-msg
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 998d27d8fe..6e3b3c22a8 100644
--- a/Makefile
+++ b/Makefile
@@ -880,6 +880,7 @@ LIB_OBJS += ewah/ewah_rlw.o
LIB_OBJS += exec-cmd.o
LIB_OBJS += fetch-negotiator.o
LIB_OBJS += fetch-pack.o
+LIB_OBJS += fmt-merge-msg.o
LIB_OBJS += fsck.o
LIB_OBJS += fsmonitor.o
LIB_OBJS += gettext.o
@@ -946,6 +947,7 @@ LIB_OBJS += progress.o
LIB_OBJS += promisor-remote.o
LIB_OBJS += prompt.o
LIB_OBJS += protocol.o
+LIB_OBJS += prune-packed.o
LIB_OBJS += quote.o
LIB_OBJS += range-diff.o
LIB_OBJS += reachable.o