]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/make-findstring-makeflags-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2015 19:30:20 +0000 (12:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2015 19:30:20 +0000 (12:30 -0700)
commit96090283e0ba646c599b6a15834bdbb8dd731b4a
tree5cca5a4dbe82d1817ab89dd3e2b57e483aca8ee6
parent65e1449614d3af34a022007cd335d0e563dea721
parentef49e05a6431727b54c399d1f3636c76ac682d61
Merge branch 'jk/make-findstring-makeflags-fix'

Customization to change the behaviour with "make -w" and "make -s"
in our Makefile was broken when they were used together.

* jk/make-findstring-makeflags-fix:
  Makefile: fix MAKEFLAGS tests with multiple flags
Makefile