summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:36 -0700
commitf4f8dfe127918241c1e3448436d32a89f13fa5a8 (patch)
tree7da8889b7333a7744024f53192f397f68b5b9761 /Makefile
parentMerge branch 'jk/eoo' (diff)
parentrepo-settings: create feature.experimental setting (diff)
downloadtgif-f4f8dfe127918241c1e3448436d32a89f13fa5a8.tar.xz
Merge branch 'ds/feature-macros'
A mechanism to affect the default setting for a (related) group of configuration variables is introduced. * ds/feature-macros: repo-settings: create feature.experimental setting repo-settings: create feature.manyFiles setting repo-settings: parse core.untrackedCache commit-graph: turn on commit-graph by default t6501: use 'git gc' in quiet mode repo-settings: consolidate some config settings
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f9255344ae..ad71ae1219 100644
--- a/Makefile
+++ b/Makefile
@@ -965,6 +965,7 @@ LIB_OBJS += refspec.o
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
LIB_OBJS += replace-object.o
+LIB_OBJS += repo-settings.o
LIB_OBJS += repository.o
LIB_OBJS += rerere.o
LIB_OBJS += resolve-undo.o