diff --git a/git/.config/git/config b/git/.config/git/config
index 5dd127a..0672470 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -2,29 +2,23 @@
   email         = marty.oehme@gmail.com
   name          = Marty Oehme
   signingkey    = B7538B8F50A1C800
-[filter "lfs"]
-  clean         = git-lfs clean -- %f
-  smudge        = git-lfs smudge -- %f
-  process       = git-lfs filter-process
-  required      = true
+[init]
+	defaultBranch = main
 [alias]
   ignore        = "!gitignore -f"
-  pushmerge     = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html#merge-when-pipeline-succeeds-alias
+  pushmerge     = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html # merge-when-pipeline-succeeds-alias
   last          = "diff HEAD~ HEAD"
-  # push to all connected remotes
-  pushall       = "!git remote | xargs -L1 -I R git push R"
+  pushall       = "!git remote | xargs -I R git push R"            # push to all connected remotes
+
 [commit]
-  # sign commits as me
-  gpgsign       = true
-  # Always show diff when preparing commit message
-  verbose       = true
+  gpgsign       = true                                                 # sign commits as me
+  verbose       = true                                                 # Always show diff when preparing commit message
 [fetch]
-  # remove references to non-existent remote branches
-  prune         = true
+  prune         = true                                                 # remove references to non-existent remote branches
 [pull]
-  rebase        = true # always rebase on pulling, obviates merge commits
+  rebase        = true                                                 # always rebase on pulling, obviates merge commits
 [diff]
-  colorMoved    = zebra # also color stuff that has simply been moved, in a classy zebra-color
+  colorMoved    = zebra                                                # also color stuff that has simply been moved, in a classy zebra-color
 [pager]
   diff          = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )'
 [color.diff]
@@ -51,3 +45,8 @@
 [url "git@gitlab.com:"]
   pushInsteadOf = "https://gitlab.com"
   pushInsteadOf = "http://gitlab.com"
+[filter "lfs"]
+  clean         = git-lfs clean -- %f
+  smudge        = git-lfs smudge -- %f
+  process       = git-lfs filter-process
+  required      = true
diff --git a/git/.config/sh/alias.d/git.sh b/git/.config/sh/alias.d/git.sh
index 9f3bad4..7903589 100644
--- a/git/.config/sh/alias.d/git.sh
+++ b/git/.config/sh/alias.d/git.sh
@@ -18,7 +18,7 @@ alias gc='git commit -v'
 alias gc!='git commit -v --amend'
 alias gcn!='git commit -v --no-edit --amend'
 
-alias gcm='git checkout master'
+alias gcm='git checkout master 2>/dev/null || git checkout main'
 alias gcd='git checkout develop'
 alias gcb='git checkout -b'
 alias gco='git checkout'
@@ -55,7 +55,7 @@ alias grs!='git restore'
 alias grb='git rebase'
 alias grbi='git rebase -i'
 alias grbc='git rebase --continue'
-alias grbm='git rebase master'
+alias grbm='git rebase master || git rebase main'
 
 alias gst='git status'