summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:37 (GMT)
commitfa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362 (patch)
tree9fd95dbfb14d7d90294bcbed371db3d2d7eb7061 /Makefile
parent93b74a7cfa47b636c060b033bc7d03319f7841e2 (diff)
parentfb3010c31fdaa00ae91152431c3da7e300daf848 (diff)
downloadgit-fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362.zip
git-fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362.tar.gz
git-fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362.tar.bz2
Merge branch 'jk/show-index'
Modernize a less often used command. * jk/show-index: show-index: update documentation for index v2 make show-index a builtin
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e4b503d..edba229 100644
--- a/Makefile
+++ b/Makefile
@@ -689,7 +689,6 @@ PROGRAM_OBJS += http-backend.o
PROGRAM_OBJS += imap-send.o
PROGRAM_OBJS += sh-i18n--envsubst.o
PROGRAM_OBJS += shell.o
-PROGRAM_OBJS += show-index.o
PROGRAM_OBJS += remote-testsvn.o
# Binary suffix, set to .exe for Windows builds
@@ -1077,6 +1076,7 @@ BUILTIN_OBJS += builtin/send-pack.o
BUILTIN_OBJS += builtin/serve.o
BUILTIN_OBJS += builtin/shortlog.o
BUILTIN_OBJS += builtin/show-branch.o
+BUILTIN_OBJS += builtin/show-index.o
BUILTIN_OBJS += builtin/show-ref.o
BUILTIN_OBJS += builtin/stripspace.o
BUILTIN_OBJS += builtin/submodule--helper.o