diff --git a/common/.zshrc b/common/.zshrc
index 27ac9b3..132d7b0 100644
--- a/common/.zshrc
+++ b/common/.zshrc
@@ -97,6 +97,29 @@ goreinu()    { ssc goreinu.kujiu.org       ${argv[-1]:-`whoami`} 22 $argv[1,-2];
 pakunoda()   { ssc pakunoda.kujiu.org      ${argv[-1]:-`whoami`} 22 $argv[1,-2]; }
 hisoka()     { ssc hisoka.kujiu.org        ${argv[-1]:-`whoami`} 22 $argv[1,-2]; }
 
+alias gitst="git status | more"
+alias gitci="git commit"
+alias gitcia='git commmit -a'
+alias gitco="git checkout"
+alias gitdiff='git diff'
+alias gitgrep='git grep'
+alias gitlog='git log --name-status'
+alias gittree='git log --graph'
+alias gitlstags='git describe --tags'
+alias gittag='git tag -a'
+
+gitgrephistory(){
+if [ $# = 1 ] ; then
+    git rev-list --all | xargs git grep "$1"
+else
+    git rev-list --all | sed 's!$!:'"$1"'!'  | xargs git grep "$2"
+fi
+}
+
+
 hl() { highlight --out-format=xterm256 -l ${argv} | less -R; }
 bindkey "^[[A" history-search-backward
 bindkey "^[[B" history-search-forward
+
+POWERLINE_DETECT_SSH="true"
+POWERLINE_FULL_CURRENT_PATH="true"
diff --git a/common/.zshrc-local b/common/.zshrc-local
deleted file mode 100644
index 05b79e5..0000000
--- a/common/.zshrc-local
+++ /dev/null
@@ -1,8 +0,0 @@
-DEBEMAIL="christophe@buffenoir.org"
-DEBFULLNAME="Christophe Buffenoir"
-
-export DEBEMAIL DEBFULLNAME
-
-POWERLINE_DETECT_SSH="true"
-POWERLINE_FULL_CURRENT_PATH="true"
-