From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2018 20:22:37 +0000 (-0700)
Subject: Merge branch 'jk/show-index'
X-Git-Tag: v2.19.0-rc0~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362;p=thirdparty%2Fgit.git

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
---

fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362
diff --cc Makefile
index e4b503d259,ebc1a57cd4..edba229552
--- a/Makefile
+++ b/Makefile
@@@ -689,7 -642,7 +689,6 @@@ PROGRAM_OBJS += http-backend.
  PROGRAM_OBJS += imap-send.o
  PROGRAM_OBJS += sh-i18n--envsubst.o
  PROGRAM_OBJS += shell.o
- PROGRAM_OBJS += show-index.o
 -PROGRAM_OBJS += upload-pack.o
  PROGRAM_OBJS += remote-testsvn.o
  
  # Binary suffix, set to .exe for Windows builds
@@@ -1074,9 -1016,9 +1073,10 @@@ BUILTIN_OBJS += builtin/rev-parse.
  BUILTIN_OBJS += builtin/revert.o
  BUILTIN_OBJS += builtin/rm.o
  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