]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/update-index-show-index-version'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Sep 2023 17:45:12 +0000 (10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Sep 2023 17:45:16 +0000 (10:45 -0700)
"git update-index" learns "--show-index-version" to inspect
the index format version used by the on-disk index file.

* jc/update-index-show-index-version:
  test-tool: retire "index-version"
  update-index: add --show-index-version
  update-index doc: v4 is OK with JGit and libgit2

1  2 
Makefile
builtin/update-index.c

diff --cc Makefile
Simple merge
Simple merge