feat: optimize gitconfig

Signed-off-by: Anthony Oteri <4360016+anthonyoteri@users.noreply.github.com>

.gitconfig

@@ -3,43 +3,37 @@
     aa = add --all
     ap = add --patch
     au = add --update
-
     b = branch
     ba = branch --all
     bd = branch --delete
     bD = branch --delete --force
     bm = branch --move
     bM = branch --move --force
-
     c = commit
     cs = commit --signoff
     ca = commit --amend
     cas = commit --amend --signoff
     can = commit --amend --no-edit
-	cans == commit --amend --no-edit --signoff
+    cans = commit --amend --no-edit --signoff
     ci = commit --interactive
     cis = commit --amend --signoff
     cm = commit --message
     cms = commit --signoff --message
     cv = commit --verbose
     cvs = commit --verbose --signoff
-
     cl = clone
     clb = clone --bare
     clm = clone --mirror
     clr = clone --recurse-submodules
-
     d = diff
     dc = diff --cached
     ds = diff --staged
     dw = diff --word-diff
-
     f = fetch --atomic
     F = fetch --force
     fa = fetch --all
     fp = fetch --atomic --prune --prune-tags
     fpa = fetch --prune --prune-tags --all
-
     l = log
     lc = log --pretty=format:'- %s by %an %h' --no-merges
     lg = log --graph
@@ -47,23 +41,17 @@
     lo = log --oneline
     lp = log --patch
     lt = log --topo-order
-
     o = checkout
     ob = checkout -b
-
     p = push
     pf = push --force
     puh = push -u origin HEAD
-
     r = rebase
     ri = rebase --interactive
     rim = rebase --interactive origin/master
-
     s = status --short --branch
-
     branch-list-merged = "!git branch --merged master | grep -v -E '(origin|master)'"
     branch-delete-merged = "!git branch-list-merged | xargs git branch --delete"
-
     unstage = reset HEAD
     undo-commit = reset --soft HEAD^
     set-upstream = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
@@ -74,6 +62,7 @@
 
 [commit]
     gpgsign = true
+    signoff = true
 
 [core]
     editor = nvim
@@ -82,6 +71,12 @@
     attributesfile = ~/.gitattributes
     pager = delta
 
+[credential]
+    helper = cache --timeout 21600
+    helper = oauth
+    helper = !/opt/homebrew/bin/gh auth git-credential
+    helper = !/usr/bin/glab auth git-credential
+
 [credential "https://github.com"]
     helper = !/opt/homebrew/bin/gh auth git-credential
 
@@ -90,11 +85,11 @@
 
 [delta]
     line-numbers = true
-	syntax-theme = Dracula
+    syntax-theme = Gruvbox
-	plus-style = "syntax #2A363B"
+    plus-style = "syntax #3c3836"
-	plus-emph-style = "syntax #2D4E45"
+    plus-emph-style = "syntax #504945"
-	minus-style = "syntax #3B2C37"
+    minus-style = "syntax #282828"
-	minux-emph-style = "syntax #613038"
+    minux-emph-style = "syntax #fb4934"
 
 [diff]
     colorMoved = default
@@ -124,7 +119,7 @@
     diffFilter = delta --color-only
 
 [merge]
-	conflictstyle = diff3
+    conflictstyle = zdiff3
 
 [pull]
     autosetupmerge = true
@@ -132,7 +127,7 @@
     rebase = true
 
 [push]
-	default = current
+    default = simple
 
 [rerere]
     enabled = true
@@ -142,10 +137,7 @@
     email = 4360016+anthonyoteri@users.noreply.github.com
     signingkey = D0B1B355AF8E6121
 
-# vim: set commentstring=#\ %s:
-[credential]
-	helper = cache --timeout 21600
-	helper = oauth
-
 [safe]
     directory = *
+
+# vim: set commentstring=#\ %s: