summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-16 14:32:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-16 14:32:36 -0700
commit4d2a3011eed6abda1399de2774bd8f08db1581f9 (patch)
treee5e94f9df7bc13d810bd021b33028a8d3927bcef /mergetools
parentMerge branch 'jk/connect-clear-env' into maint (diff)
parentMakefile: allow $(ARFLAGS) specified from the command line (diff)
downloadtgif-4d2a3011eed6abda1399de2774bd8f08db1581f9.tar.xz
Merge branch 'jw/make-arflags-customizable' into maint
The Makefile always runs the library archiver with hardcoded "crs" options, which was inconvenient for exotic platforms on which people want to use programs with totally different set of command line options. * jw/make-arflags-customizable: Makefile: allow $(ARFLAGS) specified from the command line
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions