main branch is dev instead of :wmaster

0xMF · Mar 15, 2024 · 0bb2e0f · 0bb2e0f
1 parent 91d6610
commit 0bb2e0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/shells/0xMF/git.ksh b/shells/0xMF/git.ksh
@@ -398,7 +398,7 @@ function parse_git_branch_colour {
 
   if [ -z "$br" ]; then
     return
-  elif [ "$br" = "master" ]; then
+  elif [ "$br" = "master" ] || [ "$br" = "dev" ] || [ "$br" = "main" ]; then
     echo "$BLUE($RED"$br"$BLUE $(parse_git_dirty)$BLUE)"
   else
     echo "$BLUE($YELLOW"$br"$BLUE $(parse_git_dirty)$BLUE)"

diff --git a/tracker/gitrc.gitconfig b/tracker/gitrc.gitconfig
@@ -52,6 +52,12 @@
 [branch "master"]
 	autoSetupRebase = never
 
+[branch "main"]
+	autoSetupRebase = never
+
+[branch "dev"]
+	autoSetupRebase = never
+
 [pull]
 	rebase = true
 
@@ -64,3 +70,6 @@
 [diff]
 	tool = less -FEqRSX
   renameLimit = 1742
+
+[init]
+	defaultBranch = dev