aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMatt Singleton <matt@xcolour.net>2021-02-08 10:51:37 -0600
committerMatt Singleton <matt@xcolour.net>2021-02-08 10:51:37 -0600
commit56cca67b575a171b3a6a92580f0360b6fc1fab6a (patch)
treeb8a0a9e162941f5c89939248aa9d98fdea2334b3 /config
parentbd7d28036241c9070d22de7fb88d23b24094aab0 (diff)
include local git config
Diffstat (limited to 'config')
-rw-r--r--config/git/config9
1 files changed, 7 insertions, 2 deletions
diff --git a/config/git/config b/config/git/config
index f68fed8..1823b5d 100644
--- a/config/git/config
+++ b/config/git/config
@@ -32,7 +32,12 @@
[diff]
tool = meld
+
[init]
- defaultBranch = main
+ defaultBranch = main
+
[pull]
- ff = only
+ ff = only
+
+[include]
+ path = config-local