]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/no-builtins-on-disk-option'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2020 04:53:26 +0000 (21:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Oct 2020 04:53:26 +0000 (21:53 -0700)
Hotfix to breakage introduced in the topic in v2.29-rc0

* js/no-builtins-on-disk-option:
  help: do not expect built-in commands to be hardlinked

1  2 
git.c

diff --cc git.c
Simple merge