Update git aliases and sort sections

gitconfig

@@ -1,6 +1,6 @@
 [user]
-    name = Aaron Franks
     email = aaron.franks@gmail.com
+    name = Aaron Franks
 [color]
     diff = auto
     ui = true
@@ -9,11 +9,11 @@
     local = yellow
     remote = green
 [color "diff"]
-    meta = 227
+    commit = 227 bold
     frag = magenta bold
-    old = red bold
+    meta = 227
     new = green bold
-    commit = 227 bold
+    old = red bold
     whitespace = red reverse
 [color "status"]
     added = yellow
@@ -25,16 +25,16 @@
     ci = commit
     cp = cherry-pick
     changed = !git --no-pager diff --name-only
-    resume = !git --no-pager show --pretty="format:" --name-only      # List files changed in a given commit (default: HEAD)
     d  = diff
     hash = rev-parse HEAD
+    latest = for-each-ref --sort=-committerdate refs/heads --format='%(committerdate:short) %(refname:short)'
     ls  = ls-files
     mvhead = branch -f
+    resume = !git --no-pager show --pretty="format:" --name-only      # List files changed in a given commit (default: HEAD)
     s  = status
     undo = reset --soft HEAD^
     unstage = reset HEAD
-    latest = for-each-ref --sort=-committerdate refs/heads --format='%(committerdate:short) %(refname:short)'
-    trim = !sh -c 'git branch --merged master | grep -v master | xargs -n 1 git branch -d'
+    trim = !sh -c 'git branch --merged | grep -v master | grep -v dev | xargs -n 1 git branch -d && git fetch --prune'
 [branch]
     autosetupmerge = true
 [core]
@@ -44,7 +44,7 @@
 [push]
     default = current
 [color "diff-highlight"]
-    oldHighlight = red bold 52
-    newNormal = green bold
     newHighlight = green bold 22
+    newNormal = green bold
+    oldHighlight = red bold 52
     oldNormal = red bold

gitignore_global

@@ -1,3 +1,2 @@
 .DS_Store
 Session.vim
-tags

tigrc

@@ -11,6 +11,7 @@ bind generic d !@zsh -c "git branch -d %(branch)"       # remove the selected br
 bind generic D !@zsh -c "git branch -D %(branch)"       # Force-remove the selected branch
 bind generic c !@zsh -c "git checkout %(branch)"        # Checkout the selected branch (even remote)
 bind generic R !@zsh -c "git checkout master && git branch -D %(branch) && git co %(branch)"       # "re-checkout" a remote branch
+bind generic T !@zsh -c "git trim"
 bind generic s view-stash                               # regular mapping for this is 'y'
 
 set refresh-mode = periodic