diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-05 12:30:20 -0700 |
| commit | 96090283e0ba646c599b6a15834bdbb8dd731b4a (patch) | |
| tree | 5cca5a4dbe82d1817ab89dd3e2b57e483aca8ee6 /Documentation/merge-options.txt | |
| parent | Merge branch 'sb/submodule-helper' (diff) | |
| parent | Makefile: fix MAKEFLAGS tests with multiple flags (diff) | |
| download | tgif-96090283e0ba646c599b6a15834bdbb8dd731b4a.tar.xz | |
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 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions