diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:08 -0800 |
| commit | a026d5318cdcbc05690749ac9cd5c2a50d09cb14 (patch) | |
| tree | 814cc8a36f5c12ae2955fc8c46567efa95eb49c2 /Documentation/technical/trivial-merge.txt | |
| parent | Merge branch 'jc/maint-status-preload' (diff) | |
| parent | Makefile: clarify definition of TEST_OBJS (diff) | |
| download | tgif-a026d5318cdcbc05690749ac9cd5c2a50d09cb14.tar.xz | |
Merge branch 'jn/makedepend'
* jn/makedepend:
Makefile: clarify definition of TEST_OBJS
Makefile: always remove .depend directories on 'make clean'
Makefile: tuck away generated makefile fragments in .depend
Teach Makefile to check header dependencies
Makefile: list standalone program object files in PROGRAM_OBJS
Makefile: lazily compute header dependencies
Makefile: list generated object files in OBJECTS
Makefile: disable default implicit rules
Makefile: rearrange dependency rules
Makefile: transport.o depends on branch.h now
Makefile: drop dependency on $(wildcard */*.h)
Makefile: clean up http-walker.o dependency rules
Makefile: remove wt-status.h from LIB_H
Makefile: make sure test helpers are rebuilt when headers change
Makefile: add missing header file dependencies
Conflicts:
Makefile
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions