]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/pcre-v2'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:34 +0000 (12:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:34 +0000 (12:14 +0900)
Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.

* ab/pcre-v2:
  grep: fix NO_LIBPCRE1_JIT to fully disable JIT

1  2 
grep.c
grep.h

diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge