Git aliases

gitconfig

@@ -49,10 +49,10 @@
   ffp = flow feature publish
   fi = flow init
   rs = reset HEAD --hard
+  fame = shortlog -sn --all --no-merges
   hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
   l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
-  pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
 
 [diff]
   tool = nvim -d

zsh/aliases

@@ -60,7 +60,7 @@ alias upall='brewup && npmup'
 
 # other often used stuff, mostly node/npm
 alias nr='npm run'
-alias npmre='rm -rf node_modules && npm cache clean --force && npm install'
+alias npmre='rm -rf node_modules && npm install'
 
 # easy hosts / apache / php editing
 alias hosts='sudo $EDITOR /etc/hosts'