summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-05 19:30:19 (GMT)
commit65e1449614d3af34a022007cd335d0e563dea721 (patch)
tree2369279dd32ac37d6d8637b1df5d04a73fded819 /Makefile
parent8a54523f0f70134327e7b2a625b1777c796b07d5 (diff)
parentee8838d157761acf4cc38f2378277dc894c10eb0 (diff)
downloadgit-65e1449614d3af34a022007cd335d0e563dea721.zip
git-65e1449614d3af34a022007cd335d0e563dea721.tar.gz
git-65e1449614d3af34a022007cd335d0e563dea721.tar.bz2
Merge branch 'sb/submodule-helper'
The infrastructure to rewrite "git submodule" in C is being built incrementally. Let's polish these early parts well enough and make them graduate to 'next' and 'master', so that the more involved follow-up can start cooking on a solid ground. * sb/submodule-helper: submodule: rewrite `module_clone` shell function in C submodule: rewrite `module_name` shell function in C submodule: rewrite `module_list` shell function in C
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8d5df7e..1d10225 100644
--- a/Makefile
+++ b/Makefile
@@ -902,6 +902,7 @@ BUILTIN_OBJS += builtin/shortlog.o
BUILTIN_OBJS += builtin/show-branch.o
BUILTIN_OBJS += builtin/show-ref.o
BUILTIN_OBJS += builtin/stripspace.o
+BUILTIN_OBJS += builtin/submodule--helper.o
BUILTIN_OBJS += builtin/symbolic-ref.o
BUILTIN_OBJS += builtin/tag.o
BUILTIN_OBJS += builtin/unpack-file.o