update gitconfig

BarretRen · Mar 29, 2024 · 8875f65 · 8875f65
1 parent 8b17adb
commit 8875f65
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/dot/.gitconfig b/dot/.gitconfig
@@ -1,6 +1,3 @@
-[user]
-    name = Barret Ren
-    email = [email protected]
 [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 = [email protected]
+    name = Barret Ren
+; use other config for certain folder
+[includeIf "gitdir:~/repos/"]
+    path = ~/.gitconfig-work