summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsay1.demon.co.uk>2010-05-08 18:36:15 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-08 11:14:40 -0700
commite5bd0a1b362ecc4bcd03a4d3628c7e78f861f3ca (patch)
tree1372727304c8467c8e1788f3bb5f2afb130871c6 /builtin/merge-file.c
parentDocumentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef (diff)
downloadtgif-e5bd0a1b362ecc4bcd03a4d3628c7e78f861f3ca.tar.xz
Makefile: Fix 'clean' target to remove all gitweb build files
In particular the gitweb/GITWEB-BUILD-OPTIONS file was not being removed by the main Makefile. However, the gitweb/Makefile has a 'clean' target that correctly removes all the build products. In order to fix the problem, rather than duplicate the clean-up instructions, we change the main Makefile so that it delegates the clean-up actions to the gitweb Makefile. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions