several aliases added

aliases

@@ -31,7 +31,6 @@ alias rk="bundle exec rake"
 
 alias e="emacs"
 alias ew="emacs -nw"
-alias k="kuso"
 
 alias g="git"
 alias gl="git pull"
@@ -70,10 +69,21 @@ alias kla="killall"
 
 alias f="find . -iname "
 
-alias c="cordova"
 
 alias m="mount "
 alias um="umount "
 
 alias ch="chmod "
 alias co="chown "
+
+alias d="docker"
+alias d-="docker-compose"
+
+alias a="apt"
+alias ai="apt install"
+alias au="apt update"
+alias n="npm"
+alias nr="npm run"
+alias y="yarn"
+alias yi="yarn add"
+alias yr="yarn run"

lib/git.zsh

@@ -136,7 +136,7 @@ function git_push() {
 }
 
 function git_pull() {
-  git pull origin `git_current_branch`
+  git pull origin `git_current_branch` --rebase
 }
 
 #this is unlikely to change so make it all statically assigned