diff --git a/plugins/git/README.md b/plugins/git/README.md
index 8462dda1c..5150656df 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -1,4 +1,10 @@
 ## git
-**Maintainer:** [Stibbons](https://github.com/Stibbons)
 
-This plugin adds several git aliases and increase the completion function provided by zsh
+**Maintainers:** [@Stibbons](https://github.com/Stibbons), [@ncanceill](https://github.com/ncanceill)
+
+This plugin adds many aliases and improves the default completion function.
+
+### Usage
+
+See the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git) for a list of aliases and functions provided by the plugin.
+
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..b1a6e1100 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,34 +1,96 @@
+#
+# Compatibility
+#
+
+# Check xargs flavor for -r flag
+echo | xargs -r &>/dev/null && XARGS_OPTS="-r"
+
+#
+# Functions
+#
+
+# The current branch name
+# Usage example: git pull origin $(current_branch)
+function current_branch() {
+  if [ ! -d .git ]; then return; fi
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  echo ${ref#refs/heads/}
+}
+# The list of remotes
+function current_repository() {
+  if [ ! -d .git ]; then return; fi
+  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+  echo $(git remote -v | cut -d':' -f 2)
+}
+# Pretty log messages
+function _git_log_prettily(){
+  if ! [ -z $1 ]; then
+    git log --pretty=$1
+  fi
+}
+# This function return a warning if the current branch is a wip
+function work_in_progress() {
+  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
+    echo "WIP!!"
+  fi
+}
+
+#
 # Aliases
+#
 alias g='git'
 compdef g=git
+# Status
 alias gst='git status'
 compdef _git gst=git-status
+alias gss='git status -s'
+compdef _git gss=git-status
+alias gsb='git status -sb'
+compdef _git gsb=git-status
+# Diff
 alias gd='git diff'
 compdef _git gd=git-diff
 alias gdc='git diff --cached'
 compdef _git gdc=git-diff
+gdv() { git diff -w "$@" | view - }
+compdef _git gdv=git-diff
+alias gdw='git diff --word-diff'
+compdef _git gdw=git-diff
+alias gbl='git blame -b -w'
+compdef _git gbl=git-blame
+# Pull
 alias gl='git pull'
 compdef _git gl=git-pull
 alias gup='git pull --rebase'
 compdef _git gup=git-fetch
+# Push
 alias gp='git push'
 compdef _git gp=git-push
-alias gd='git diff'
-gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
+alias gpf='git push --force'
+compdef _git gpf=git-push
+alias gpd='git push --dry-run'
+compdef _git gpd=git-push
+alias gpoat='git push origin --all && git push origin --tags'
+compdef _git gpoat=git-push
+# Commit
 alias gc='git commit -v'
 compdef _git gc=git-commit
 alias gc!='git commit -v --amend'
 compdef _git gc!=git-commit
 alias gca='git commit -v -a'
-compdef _git gc=git-commit
+compdef _git gca=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
 alias gcmsg='git commit -m'
 compdef _git gcmsg=git-commit
+# Checkout
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gcm='git checkout master'
+compdef _git gcm=git-checkout
+# Remote
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'
@@ -41,24 +103,80 @@ alias grset='git remote set-url'
 compdef _git grset=git-remote
 alias grup='git remote update'
 compdef _git grset=git-remote
-alias grbi='git rebase -i'
-compdef _git grbi=git-rebase
+# Rebase
+alias grb='git rebase'
+compdef _git grb=git-rebase
 alias grbc='git rebase --continue'
 compdef _git grbc=git-rebase
+alias grbs='git rebase --skip'
+compdef _git grbs=git-rebase
 alias grba='git rebase --abort'
 compdef _git grba=git-rebase
+alias grbm='git rebase master'
+compdef _git grbm=git-rebase
+alias grbi='git rebase -i'
+compdef _git grbi=git-rebase
+alias gr1='git rebase -i HEAD~'
+compdef _git gr1=git-rebase
+alias gr2='git rebase -i HEAD~2'
+compdef _git gr2=git-rebase
+alias gr3='git rebase -i HEAD~3'
+compdef _git gr3=git-rebase
+alias gr4='git rebase -i HEAD~4'
+compdef _git gr4=git-rebase
+alias gr5='git rebase -i HEAD~5'
+compdef _git gr5=git-rebase
+alias gr6='git rebase -i HEAD~6'
+compdef _git gr6=git-rebase
+alias gr7='git rebase -i HEAD~7'
+compdef _git gr7=git-rebase
+alias gr8='git rebase -i HEAD~8'
+compdef _git gr8=git-rebase
+alias gr9='git rebase -i HEAD~9'
+compdef _git gr9=git-rebase
+alias gr10='git rebase -i HEAD~10'
+compdef _git gr10=git-rebase
+# Cherry-pick
+alias gcp='git cherry-pick'
+compdef _git gcp=git-cherry-pick
+# Branch
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
+alias gbnm='git branch --no-merged'
+compdef _git gbnm=git-branch
+# Config
+alias gcl='git config --list'
+compdef _git gcl=git-config
+# Add
+alias ga='git add'
+compdef _git ga=git-add
+# Merge
+alias gm='git merge'
+compdef _git gm=git-merge
+alias gmum='git merge upstream/master'
+compdef _git gmum=git-merge
+alias gmt='git mergetool --no-prompt'
+compdef _git gmt=git-mergetool
+alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
+compdef _git gmtvim=git-mergetool
+# Reset
+alias grh='git reset HEAD'
+compdef _git grh=git-reset
+alias grhh='git reset HEAD --hard'
+compdef _git grhh=git-reset
+alias gru='git reset --'
+compdef _git gru=git-reset
+alias gclean='git reset --hard && git clean -dfx'
+# Log
 alias gcount='git shortlog -sn'
 compdef gcount=git
-alias gcl='git config --list'
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
-alias glg='git log --stat --max-count=10'
+alias glg='git log --stat --color'
 compdef _git glg=git-log
-alias glgg='git log --graph --max-count=10'
+alias glgp='git log --stat --color -p'
+compdef _git glgp=git-log
+alias glgg='git log --graph --color'
 compdef _git glgg=git-log
 alias glgga='git log --graph --decorate --all'
 compdef _git glgga=git-log
@@ -66,97 +184,88 @@ alias glo='git log --oneline --decorate --color'
 compdef _git glo=git-log
 alias glog='git log --oneline --decorate --color --graph'
 compdef _git glog=git-log
-alias gss='git status -s'
-compdef _git gss=git-status
-alias ga='git add'
-compdef _git ga=git-add
-alias gm='git merge'
-compdef _git gm=git-merge
-alias grh='git reset HEAD'
-alias grhh='git reset HEAD --hard'
-alias gclean='git reset --hard && git clean -dfx'
-alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
-
-#remove the gf alias
-#alias gf='git ls-files | grep'
-
-alias gpoat='git push origin --all && git push origin --tags'
-alias gmt='git mergetool --no-prompt'
-compdef _git gm=git-mergetool
-
+alias glgm='git log --graph --max-count=10'
+compdef _git glgm=git-log
+alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
+compdef _git gwch=git-whatchanged
+alias glp="_git_log_prettily"
+compdef _git glp=git-log
+# GUI
 alias gg='git gui citool'
 alias gga='git gui citool --amend'
 alias gk='gitk --all --branches'
-
+# Stash
 alias gsts='git stash show --text'
+compdef _git gsts='git-stash'
 alias gsta='git stash'
+compdef _git gsta='git-stash'
 alias gstp='git stash pop'
+compdef _git gstp='git-stash'
 alias gstd='git stash drop'
-
-# Will cd into the top of the current repository
-# or submodule.
+compdef _git gstd='git-stash'
+alias gstl='git stash list'
+compdef _git gstl='git-stash'
+alias gstaa='git stash apply'
+compdef _git gstaa='git-stash'
+# Gitk
+alias gk='\gitk --all --branches'
+compdef _git gk='gitk'
+# show complete history, with dangling commits
+# Note: if the commit has been cleaned by 'git gc', the dangling
+# commits older than 2 weeks may have been deleted
+alias gke='\gitk --all $(git log -g --pretty=format:%h)'
+compdef _git gke='gitk'
+# Remove all .orig, .BASE.*, .REMOTE.*, .LOCAL.*, *.BACKUP files
+alias gclean="find . -name '*.orig' -or -name '*.REMOTE.*' -or \
+-name '*.LOCAL.*' -or -name '*.BACKUP.*' -or -name '*.BASE.*' | \
+xargs $XARGS_OPTS rm -v"
+# cd into the top of the current repository or submodule
 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
-
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
-
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
-#
-# Will return the current branch name
-# Usage example: git pull origin $(current_branch)
-#
-function current_branch() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo ${ref#refs/heads/}
+# Current branch
+ggl() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git pull origin "${b:=$1}"
 }
-
-function current_repository() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo $(git remote -v | cut -d':' -f 2)
+compdef _git ggl=git-checkout
+ggu() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git pull --rebase origin "${b:=$1}"
 }
-
-# these aliases take advantage of the previous function
-alias ggpull='git pull origin $(current_branch)'
-compdef ggpull=git
-alias ggpur='git pull --rebase origin $(current_branch)'
-compdef ggpur=git
-alias ggpush='git push origin $(current_branch)'
-compdef ggpush=git
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-compdef ggpnp=git
-
-# Pretty log messages
-function _git_log_prettily(){
-  if ! [ -z $1 ]; then
-    git log --pretty=$1
-  fi
+compdef _git ggu=git-checkout
+ggp() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git push origin "${b:=$1}"
 }
-alias glp="_git_log_prettily"
-compdef _git glp=git-log
-
+compdef _git ggp=git-checkout
+ggpnp() {
+  ggl "$1" && ggp "$1"
+}
+compdef _git ggpnp=git-checkout
 # Work In Progress (wip)
-# These features allow to pause a branch development and switch to another one (wip)
+# These features allow to pause a branch development and switch to another one
 # When you want to go back to work, just unwip it
-#
-# This function return a warning if the current branch is a wip
-function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
-    echo "WIP!!"
-  fi
-}
-# these alias commit and uncomit wip branches
-alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"'
+alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 git rm 2>/dev/null; git commit -m \"--wip--\""
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-
-# these alias ignore changes to file
+# Ignore changes to file
 alias gignore='git update-index --assume-unchanged'
 alias gunignore='git update-index --no-assume-unchanged'
-# list temporarily ignored files
+# List temporarily ignored files
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+# Grep list of files in the index
+function gfg() { git ls-files | grep $@ }
+compdef gfg=grep
+# Submodules
+alias gf='git fetch'
+compdef _git gf=git-fetch
+alias gsi='git submodule init'
+compdef _git gsi=git-submodule
+alias gsu='git submodule update'
+compdef _git gsu=git-submodule
 
-
-
+# Compatibility
+unset XARGS_OPTS