From 8875f65470815443deb66d6bf1f68dd457fff7bc Mon Sep 17 00:00:00 2001
From: Barret Ren <Barret.Ren@outlook.com>
Date: Fri, 29 Mar 2024 09:34:23 +0800
Subject: [PATCH] update gitconfig

---
 dot/.gitconfig | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dot/.gitconfig b/dot/.gitconfig
index 0452b27..7a30356 100755
--- a/dot/.gitconfig
+++ b/dot/.gitconfig
@@ -1,6 +1,3 @@
-[user]
-    name = Barret Ren
-    email = Barret.Ren@outlook.com
 [branch]
     autosetuprebase = always
 [core]
@@ -34,9 +31,17 @@
     interactive = auto
     status = auto
     ui = auto
+[init]
+    defaultBranch = master
 [merge]
     tool = meld
 [mergetool "meld"]
     # Choose one of these 2 lines (not both!) explained below.
     cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
     ;cmd = meld"$LOCAL""$BASE""$REMOTE" --output"$MERGED"
+[user]
+    email = Barret.Ren@outlook.com
+    name = Barret Ren
+; use other config for certain folder
+[includeIf "gitdir:~/repos/"]
+    path = ~/.gitconfig-work