summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:49 -0700
commitbbfc8212e11de3f6aad7b77a3d7138083a39c336 (patch)
tree0d2f3069d308a0b66b35c7f07185b06507e642a3 /builtin/merge.c
parentMerge branch 'jk/http-redact-fix' into maint (diff)
parentMakefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes (diff)
downloadtgif-bbfc8212e11de3f6aad7b77a3d7138083a39c336.tar.xz
Merge branch 'ab/make-clean-depend-dirs' into maint
"make clean" has been updated to remove leftover .depend/ directories, even when it is not told to use them to compute header dependencies. * ab/make-clean-depend-dirs: Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions