adjusting fish shell

fish/config.fish

@@ -26,15 +26,13 @@ if status --is-interactive
     set -g fish_user_abbreviations
     abbr --add wtm 'cd ~/Documents/workspace_tm'
     abbr --add gst 'git status'
-    abbr --add gst 'git status'
-    abbr --add gst 'git status'
-    abbr --add gst 'git status'
-    abbr --add gst 'git status'
+    abbr --add gd 'git diff'
     abbr --add ga 'git add .'
     abbr --add gl 'git pull'
     abbr --add gup 'git fetch && git rebase'
     abbr --add gp 'git push'
     abbr --add gc 'git commit -v'
+    abbr --add gc! 'git commit --amend'
     abbr --add gca 'git commit -v -a'
     abbr --add gco 'git checkout'
     abbr --add gb 'git branch'
@@ -47,6 +45,7 @@ if status --is-interactive
     abbr --add bxrc 'bundle exec rails c'
     abbr --add bxrs 'bundle exec rails s'
     abbr --add cloud 'cd ~/Library/Mobile\ Documents/com~apple~CloudDocs'
+    abbr --add gdiff "git log --graph --pretty=format:'%Cred%h%Creset - %s %Creset' --abbrev-commit production..staging2"
 end
 
 # disable login greeting

spacemacs

@@ -155,8 +155,8 @@ values."
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font, or prioritized list of fonts. `powerline-scale' allows to
    ;; quickly tweak the mode-line size to make separators look not too crappy.
-   dotspacemacs-default-font '("Source Code Pro"
-                               :size 16
+   dotspacemacs-default-font '("Source Code Pro for Powerline"
+                               :size 15
                                :weight normal
                                :width normal
                                :powerline-scale 1.1)