aboutsummaryrefslogtreecommitdiff
path: root/config/git
diff options
context:
space:
mode:
Diffstat (limited to 'config/git')
-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