From d95c46b79d6a912a15fbf826e84bce184f3d021f Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Tue, 8 Aug 2017 13:45:42 +0200
Subject: [PATCH] Git aliases

---
 gitconfig   | 2 +-
 zsh/aliases | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index e3e693da..e0a1e8ca 100644
--- a/gitconfig
+++ b/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
diff --git a/zsh/aliases b/zsh/aliases
index 46b6d1ba..d9d2948e 100644
--- a/zsh/aliases
+++ b/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'