diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-05 19:30:20 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 19:30:20 (GMT) |
commit | 96090283e0ba646c599b6a15834bdbb8dd731b4a (patch) | |
tree | 5cca5a4dbe82d1817ab89dd3e2b57e483aca8ee6 /sha1_file.c | |
parent | 65e1449614d3af34a022007cd335d0e563dea721 (diff) | |
parent | ef49e05a6431727b54c399d1f3636c76ac682d61 (diff) | |
download | git-96090283e0ba646c599b6a15834bdbb8dd731b4a.zip git-96090283e0ba646c599b6a15834bdbb8dd731b4a.tar.gz git-96090283e0ba646c599b6a15834bdbb8dd731b4a.tar.bz2 |
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
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions