summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-07 15:13:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-07 15:13:34 -0800
commit45bb6cbb49699a64196ed866c4809cd8267bd481 (patch)
treea276aa57155d294793b0ed712c7708266109593c /builtin/merge-tree.c
parentStart preparing for 1.8.1.3 (diff)
parentMakefile: explicitly set target name for autogenerated dependencies (diff)
downloadtgif-45bb6cbb49699a64196ed866c4809cd8267bd481.tar.xz
Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint
Buggy versions of ccache broke the auto-generation of dependencies. * jn/auto-depend-workaround-buggy-ccache: Makefile: explicitly set target name for autogenerated dependencies
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions