diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:02 -0700 |
| commit | ed953e1076c6a0dca1e2fd32ba8158a13929238c (patch) | |
| tree | 029c0569b1b46961852938820964ddf260499df3 /t/t7605-merge-resolve.sh | |
| parent | The third patch (diff) | |
| parent | Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets (diff) | |
| download | tgif-ed953e1076c6a0dca1e2fd32ba8158a13929238c.tar.xz | |
Merge branch 'ab/make-cleanup'
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
* ab/make-cleanup:
Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets
Makefile: split OBJECTS into OBJECTS and GIT_OBJS
Makefile: sort OBJECTS assignment for subsequent change
Makefile: split up long OBJECTS line
Makefile: guard against TEST_OBJS in the environment
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions