summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2012-07-22 18:47:26 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-22 21:30:26 -0700
commit1015cc4225542ba69cf1627a743978f304a29c71 (patch)
treeef396e6789d04f7dcfba2888594113a289ff03ca /git-merge-resolve.sh
parentGit 1.7.9.7 (diff)
downloadtgif-1015cc4225542ba69cf1627a743978f304a29c71.tar.xz
Makefile: fix location of listing produced by "make subdir/foo.s"
When I invoke "make block-sha1/sha1.s", 'make' runs $(CC) -S without specifying where it should put its output and the output ends up in ./sha1.s. Confusing. Add an -o option to the .s rule to fix this. We were already doing that for most compiler invocations but had forgotten it for the assembler listings. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions