]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/no-builtins-on-disk-option' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Oct 2020 22:01:21 +0000 (15:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Oct 2020 22:01:22 +0000 (15:01 -0700)
Brown-paper-bag fix.

* js/no-builtins-on-disk-option:
  SKIP_DASHED_BUILT_INS: do not skip the bin/ programs

1  2 
Makefile

diff --cc Makefile
Simple merge