From ab8dd41a4bb7cbb1cb45aebfca657a7a8d9b8ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 12 Dec 2013 23:27:22 +0100
Subject: [PATCH 01/31] Avoid evaluating special chars in $LINE on title
 command (fixes #2234)

---
 lib/termsupport.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 80319e1a8..6eba8f69a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,9 +27,8 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2:gs/$/\\$}"
-  LINE="${LINE:gs/%/%%}"
-  title "$CMD" "%100>...>$LINE%<<"
+  local LINE="${2}"
+  title "$CMD" '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From a27b8780b0b7405b21658116f4b044ab5317b4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 02:13:18 +0100
Subject: [PATCH 02/31] Use single quotes also in $LINE definiton

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 6eba8f69a..d3d8c967f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2}"
+  local LINE='${2}'
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From 9232282c12784c1042ab2cb77b8446e437a94c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Dec 2013 04:30:29 +0100
Subject: [PATCH 03/31] Revert previous commit, escape %

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index d3d8c967f..623bf1f09 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,7 +27,7 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE='${2}'
+  local LINE="${2:gs/%/%%}"
   title "$CMD" '%100>...>$LINE%<<'
 }
 

From e1c09a95951e7636887a6ce317c7345dfe924d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 16 Dec 2013 09:24:24 +0100
Subject: [PATCH 04/31] Avoid 'title:parse error' with single quotes in $CMD
 Fixes #2182

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 623bf1f09..5f2fe63d4 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -28,7 +28,7 @@ function omz_termsupport_preexec {
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
   local LINE="${2:gs/%/%%}"
-  title "$CMD" '%100>...>$LINE%<<'
+  title '$CMD' '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From 1f38f09be415450d017b9243f84f14f68eff4a15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 12 Dec 2013 23:27:22 +0100
Subject: [PATCH 05/31] Avoid evaluating special chars in $LINE on title
 command (fixes #2234)

---
 lib/termsupport.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 80319e1a8..6eba8f69a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,9 +27,8 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2:gs/$/\\$}"
-  LINE="${LINE:gs/%/%%}"
-  title "$CMD" "%100>...>$LINE%<<"
+  local LINE="${2}"
+  title "$CMD" '%100>...>$LINE%<<'
 }
 
 autoload -U add-zsh-hook

From f21948d6c56ae0bfbba90f84bf144de33630f7de Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sun, 2 Feb 2014 13:31:02 +0100
Subject: [PATCH 06/31] remove brackets from URLs when parsing user SSH known
 hosts, maybe also required for system known hosts, partially fixes #2414

---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e0cdcf626..1336fd77f 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -33,7 +33,7 @@ cdpath=(.)
 
 # use /etc/hosts and known_hosts for hostname completion
 [ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
-[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
+[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${(S)${(S)${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}#[\[]}#[\]]}) || _ssh_hosts=()
 [ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(

From afd1883f004c5c1f5ed0ad556266d1326ae91a7a Mon Sep 17 00:00:00 2001
From: mrbfrank <mrbfrank@gmail.com>
Date: Tue, 28 Jan 2014 21:54:00 -0600
Subject: [PATCH 07/31] corrected branch character
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

changed ± to 
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 01cdc80e5..396a4cb17 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -90,7 +90,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats '%u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//± }${vcs_info_msg_0_}"
+    echo -n "${ref/refs\/heads\// }${vcs_info_msg_0_}"
   fi
 }
 

From 0f61bfd98dfddc348665e0b3f6925de747c08cb6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sat, 8 Mar 2014 15:28:16 +0100
Subject: [PATCH 08/31] reverted termsupport back to upstream

---
 lib/termsupport.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 6eba8f69a..80319e1a8 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -27,8 +27,9 @@ function omz_termsupport_preexec {
   emulate -L zsh
   setopt extended_glob
   local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd
-  local LINE="${2}"
-  title "$CMD" '%100>...>$LINE%<<'
+  local LINE="${2:gs/$/\\$}"
+  LINE="${LINE:gs/%/%%}"
+  title "$CMD" "%100>...>$LINE%<<"
 }
 
 autoload -U add-zsh-hook

From 7f5f8c36f5935b8c3e8a53420d55d195e0ab0774 Mon Sep 17 00:00:00 2001
From: Anton Eicher <antone@antone-3.desktop.amazon.com>
Date: Wed, 19 Dec 2012 07:22:03 -0800
Subject: [PATCH 09/31] Added check for .git directory in current, before
 wasting time querying git. This saves seconds on my pc.

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 9f7819df3..6e6ba0560 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -108,12 +108,14 @@ alias gsd='git svn dcommit'
 # 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/}
 }
 
 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)

From e3d8d7bebe9b73186d02a7b10624e7ade2b41060 Mon Sep 17 00:00:00 2001
From: Maxime Fabre <ehtnam6@gmail.com>
Date: Fri, 12 Jul 2013 15:26:04 +0200
Subject: [PATCH 10/31] Add submodule helpers to Git plugin

From #1116

Modified: compdef needs _git entry point
Modifier: ncanceill <https://github.com/ncanceill>

Original commit:
Author :     Maxime Fabre <ehtnam6@gmail.com>

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6e6ba05..53046de 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -161,4 +161,10 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'

-
+# Submodules
+alias gf='git fetch'
+compdef _git gf=git-fetch
+alias gsi='git submodule init'
+compdef gsi=git-submodule
+alias gsu='git submodule update'
+compdef gsu=git-submodule
---
 plugins/git/git.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6e6ba0560..925782269 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -161,4 +161,10 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 
 
-
+# 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

From 588943ea5712b38cf10df768860179249a852215 Mon Sep 17 00:00:00 2001
From: Kirill Panshin <kipanshi@gmail.com>
Date: Tue, 17 Jul 2012 11:58:32 +0400
Subject: [PATCH 11/31] Additional commands to git plugin

Original author :     Kirill Panshin <kipanshi@gmail.com>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
---
 plugins/git/git.plugin.zsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 925782269..2f9085d7d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -13,7 +13,6 @@ alias gup='git pull --rebase'
 compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
-alias gd='git diff'
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 alias gc='git commit -v'
@@ -21,7 +20,7 @@ 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'
@@ -56,9 +55,11 @@ 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

From 00072a8831dc2519acfe802ba62d0ad9c981f596 Mon Sep 17 00:00:00 2001
From: Marten Lienen <marten.lienen@gmail.com>
Date: Wed, 19 Feb 2014 16:58:00 +0100
Subject: [PATCH 12/31] Add aliases for `git rebase` and `git rebase skip`

Original author :     Marten Lienen <marten.lienen@gmail.com>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
---
 plugins/git/git.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2f9085d7d..f2dfd6256 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -40,10 +40,14 @@ alias grset='git remote set-url'
 compdef _git grset=git-remote
 alias grup='git remote update'
 compdef _git grset=git-remote
+alias grb='git rebase'
+compdef _git grb=git-rebase
 alias grbi='git rebase -i'
 compdef _git grbi=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 gb='git branch'
@@ -161,7 +165,6 @@ alias gunignore='git update-index --no-assume-unchanged'
 # list temporarily ignored files
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 
-
 # Submodules
 alias gf='git fetch'
 compdef _git gf=git-fetch

From a6c6bce3bd4bac27e939e4d65485b77cec635396 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Fri, 11 Apr 2014 10:59:13 +0200
Subject: [PATCH 13/31] fix gwip alias for some BSD flavors, fixes #2692

---
 plugins/git/git.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f2dfd6256..325b65ee4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -155,8 +155,12 @@ function work_in_progress() {
     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--"'
+
+# these aliases commit and uncommit wip branches
+# first though, check xargs flavor for -r flag
+echo | xargs -r &>/dev/null && XARGS_OPTS="-r"
+alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 git rm; git commit -m \"--wip--\""
+unset XARGS_OPTS
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 
 # these alias ignore changes to file

From 9224918c3c215a725fdb92b231eeccc54a3d235f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Cauwelier?= <herve.cauwelier@polyconseil.fr>
Date: Sat, 12 Jan 2013 12:17:45 +0100
Subject: [PATCH 14/31] plugins/git: missing compdefs, fix bad copy-paste
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original author :     Hervé Cauwelier <herve.cauwelier@polyconseil.fr>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
---
 plugins/git/git.plugin.zsh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 325b65ee4..e72623875 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -28,6 +28,7 @@ compdef _git gcmsg=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
 alias gcm='git checkout master'
+compdef _git gcm=git-checkout
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'
@@ -57,6 +58,7 @@ compdef _git gba=git-branch
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcl='git config --list'
+compdef _git gcl=git-config
 alias gcp='git cherry-pick'
 compdef _git gcp=git-cherry-pick
 alias glg='git log --stat --color'
@@ -78,14 +80,14 @@ compdef _git ga=git-add
 alias gm='git merge'
 compdef _git gm=git-merge
 alias grh='git reset HEAD'
+compdef _git grh=git-reset
 alias grhh='git reset HEAD --hard'
+compdef _git grhh=git-reset
 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'
-
+compdef _git gwc=git-whatchanged
 alias gpoat='git push origin --all && git push origin --tags'
+compdef _git gpoat=git-push
 alias gmt='git mergetool --no-prompt'
 compdef _git gm=git-mergetool
 

From a55412801cae6b89da93e955753302764a7d7dce Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitch.special@gmail.com>
Date: Tue, 7 Jan 2014 12:47:58 -0800
Subject: [PATCH 15/31] Fix gmt compdef

Fix typo: gm -> gmt
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e72623875..b24284e00 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -89,7 +89,7 @@ compdef _git gwc=git-whatchanged
 alias gpoat='git push origin --all && git push origin --tags'
 compdef _git gpoat=git-push
 alias gmt='git mergetool --no-prompt'
-compdef _git gm=git-mergetool
+compdef _git gmt=git-mergetool
 
 alias gg='git gui citool'
 alias gga='git gui citool --amend'

From 54abcf6c849374db388eead538c37d4a7ec0e800 Mon Sep 17 00:00:00 2001
From: thuai <thuai.cn@gmail.com>
Date: Sat, 17 May 2014 14:11:18 +0800
Subject: [PATCH 16/31] add alias for 'git stash list'

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index b24284e00..d3cab7b8e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -99,6 +99,7 @@ alias gsts='git stash show --text'
 alias gsta='git stash'
 alias gstp='git stash pop'
 alias gstd='git stash drop'
+alias gstl='git stash list'
 
 # Will cd into the top of the current repository
 # or submodule.

From 54d941de4af76fe7a9bedfab03e84ad3d2b08a6a Mon Sep 17 00:00:00 2001
From: Nicolas Canceill <ncanceill@users.noreply.github.com>
Date: Sat, 24 May 2014 18:04:52 +0200
Subject: [PATCH 17/31] Use custom ReadMe in master

---
 README.textile | 109 ++++++++-----------------------------------------
 1 file changed, 16 insertions(+), 93 deletions(-)

diff --git a/README.textile b/README.textile
index 4325c91eb..09742dfbe 100644
--- a/README.textile
+++ b/README.textile
@@ -1,110 +1,33 @@
 !https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png!
 
-oh-my-zsh is an open source, community-driven framework for managing your ZSH configuration. It comes bundled with a ton of helpful functions, helpers, plugins, themes, and few things that make you shout...
+This is a fork of ["@robbyrussell":https://github.com/robbyrussell]'s original project.
 
-bq. "OH MY ZSHELL!"
+h2. Contributing
 
-h2. Setup
+You can "fetch":https://help.github.com/articles/fork-a-repo this repository in order to ["participate in testing":#testing] or ["aggregate pull requests":#updating] for upstream.
 
-@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
+h2. Branches
 
-h3. The automatic installer... (do you trust me?)
+There are various branches used to help with maintenance.
 
-You can install this via the command line with either `curl` or `wget`.
+You are on the @master@ branch. I use it for my own OMZ installs, it is usually pretty close to upstream, you are welcome to take inspiration but I will not allow external changes.
 
-h4. via `curl`
+h3. Tracking
 
-@curl -L http://install.ohmyz.sh | sh@
+The "@upstream-edge@ branch":https://github.com/ncanceill/oh-my-zsh/tree/upstream-edge tracks the bleeding edge upstream. It is used as a clean starting point for new Pull Requests.
 
-h4. via `wget`
+h3. Testing
 
-@wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
+The "@upstream-test@ branch":https://github.com/ncanceill/oh-my-zsh/tree/upstream-test holds changes that need testing before merging.
 
-h4. Optional: change the install directory
+h3. Updating
 
-The default location is `~/.oh-my-zsh` (hidden in your home directory).
+These branches are used to aggregate Pull Requests into categories. Please submit them to these branches, if applicable, instead of sending them directly upstream. This allows to keep the original repository clean.
 
-You can change the install directory with the ZSH environment variable, either
-by running `export ZSH=/your/path` before installing, or setting it before the
-end of the install pipeline like this:
+h4. Plugins
 
-@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
+* "@git@":https://github.com/ncanceill/oh-my-zsh/tree/plugin-git -- "Submit PR":https://github.com/ncanceill/oh-my-zsh/pull/new/plugin-git
 
+h4. Other
 
-h3. The manual way
-
-1. Clone the repository
-
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
-
-2. *OPTIONAL* Backup your existing ~/.zshrc file
-
-  @cp ~/.zshrc ~/.zshrc.orig@
-
-3. Create a new zsh config by copying the zsh template we've provided.
-
-  @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
-
-4. Set zsh as your default shell:
-
-  @chsh -s /bin/zsh@
-
-5. Start / restart zsh (open a new terminal is easy enough...)
-
-h3. Problems?
-
-You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
-
-If you installed manually or changed the install location, check ZSH in ~/.zshrc
-
-h2. Usage
-
-* enable the plugins you want in your @~/.zshrc@ (take a look at the @plugins/@ directory and the "wiki":https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins to see what's possible)
-** example: @plugins=(git osx ruby)@
-* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
-** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
-* much much more...  take a look at @lib/@ what _Oh My Zsh_ offers...
-
-h2. Useful
-
-the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips.
-
-h3. Customization
-
-If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
-If you have many functions which go well together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
-If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
-
-h3. Updates
-
-By default you will be prompted to check for updates. If you would like oh-my-zsh to automatically update itself without prompting you, set the following in your ~/.zshrc
-
-@DISABLE_UPDATE_PROMPT=true@
-
-To disable updates entirely, put this in your ~/.zshrc
-
-@DISABLE_AUTO_UPDATE=true@
-
-To upgrade directly from the command line, just run @upgrade_oh_my_zsh@
-
-h3. Uninstalling
-
-If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).
-
-h2. Help out!
-
-I'm far from being a zsh-expert and suspect there are many ways to improve. If you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
-
-h3. (Don't) Send us your theme! (for now)
-
--I'm hoping to collect a bunch of themes for our command prompts. You can see existing ones in the @themes/@ directory.-
-
-We have enough themes for the time being. Please fork the project and add on in there, you can let people know how to grab it from there.
-
-h2. Contributors
-
-This project wouldn't exist without all of our awesome users and contributors.
-
-* "View our growing list of contributors":https://github.com/robbyrussell/oh-my-zsh/contributors
-
-Thank you so much!
+* "Easy-To-Merge":https://github.com/ncanceill/oh-my-zsh/tree/easymerge -- "Submit PR":https://github.com/ncanceill/oh-my-zsh/pull/new/easymerge

From c0868ea1c00f321cff220e125e473476263c4515 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 21 May 2014 12:25:40 +0200
Subject: [PATCH 18/31] re-organized plugin (no real change)

---
 plugins/git/git.plugin.zsh | 165 ++++++++++++++++++++-----------------
 1 file changed, 90 insertions(+), 75 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d3cab7b8e..324b35130 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,20 +1,70 @@
+#
+# 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
+# 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
+# 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
-gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
+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'
@@ -25,10 +75,12 @@ 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,6 +93,7 @@ alias grset='git remote set-url'
 compdef _git grset=git-remote
 alias grup='git remote update'
 compdef _git grset=git-remote
+# Rebase
 alias grb='git rebase'
 compdef _git grb=git-rebase
 alias grbi='git rebase -i'
@@ -51,16 +104,34 @@ alias grbs='git rebase --skip'
 compdef _git grbs=git-rebase
 alias grba='git rebase --abort'
 compdef _git grba=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 gcount='git shortlog -sn'
-compdef gcount=git
+# Config
 alias gcl='git config --list'
 compdef _git gcl=git-config
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
+# Add
+alias ga='git add'
+compdef _git ga=git-add
+# Merge
+alias gm='git merge'
+compdef _git gm=git-merge
+alias gmt='git mergetool --no-prompt'
+compdef _git gmt=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 gclean='git reset --hard && git clean -dfx'
+# Log
+alias gcount='git shortlog -sn'
+compdef gcount=git
 alias glg='git log --stat --color'
 compdef _git glg=git-log
 alias glgp='git log --stat --color -p'
@@ -73,105 +144,46 @@ 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'
-compdef _git grh=git-reset
-alias grhh='git reset HEAD --hard'
-compdef _git grhh=git-reset
-alias gclean='git reset --hard && git clean -dfx'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 compdef _git gwc=git-whatchanged
-alias gpoat='git push origin --all && git push origin --tags'
-compdef _git gpoat=git-push
-alias gmt='git mergetool --no-prompt'
-compdef _git gmt=git-mergetool
-
+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'
 alias gsta='git stash'
 alias gstp='git stash pop'
 alias gstd='git stash drop'
 alias gstl='git stash list'
-
-# Will cd into the top of the current repository
-# or submodule.
+# 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() {
-  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/}
-}
-
-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)
-}
-
-# these aliases take advantage of the previous function
+# Current branch
 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)'
+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
-}
-alias glp="_git_log_prettily"
-compdef _git glp=git-log
-
 # 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 aliases commit and uncommit wip branches
-# first though, check xargs flavor for -r flag
-echo | xargs -r &>/dev/null && XARGS_OPTS="-r"
 alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 git rm; git commit -m \"--wip--\""
-unset XARGS_OPTS
 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:]]"'
-
 # Submodules
 alias gf='git fetch'
 compdef _git gf=git-fetch
@@ -179,3 +191,6 @@ alias gsi='git submodule init'
 compdef _git gsi=git-submodule
 alias gsu='git submodule update'
 compdef _git gsu=git-submodule
+
+# Compatibility
+unset XARGS_OPTS

From be8e85b71c4e614501edeb59358ef805674f98f7 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 21 May 2014 13:12:49 +0200
Subject: [PATCH 19/31] update aliases to default to current branch, fixes
 #1601

---
 plugins/git/git.plugin.zsh | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 324b35130..f1157c5a9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -166,14 +166,25 @@ compdef git-svn-dcommit-push=git
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
 # Current branch
-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
+ggl() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git pull origin "${b:=$1}"
+}
+compdef _git ggl=git-checkout
+ggu() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git pull --rebase origin "${b:=$1}"
+}
+compdef _git ggu=git-checkout
+ggp() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git push origin "${b:=$1}"
+}
+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
 # When you want to go back to work, just unwip it

From f93ee152a4a7ed098fc7292d0f2387599d7b43d6 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 21 May 2014 13:44:52 +0200
Subject: [PATCH 20/31] improve readme to abide by #2640

---
 plugins/git/README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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.
+

From 378a99f25bdd59baa8db76dc101456debcce1655 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Wed, 21 May 2014 17:14:15 +0200
Subject: [PATCH 21/31] change alias gwc to gwch, fixes #2463

---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f1157c5a9..c5efb4087 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -144,8 +144,8 @@ 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 gwc='git whatchanged -p --abbrev-commit --pretty=medium'
-compdef _git gwc=git-whatchanged
+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

From 41b181ff37509f98593b11a74b8deabdc187e3bd Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sat, 24 May 2014 19:24:19 +0200
Subject: [PATCH 22/31] add aliases from #2494

---
 plugins/git/git.plugin.zsh | 55 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index c5efb4087..3821a2e4b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -62,6 +62,10 @@ compdef _git gup=git-fetch
 # Push
 alias gp='git push'
 compdef _git gp=git-push
+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
@@ -96,14 +100,36 @@ compdef _git grset=git-remote
 # Rebase
 alias grb='git rebase'
 compdef _git grb=git-rebase
-alias grbi='git rebase -i'
-compdef _git grbi=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
@@ -121,8 +147,12 @@ 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
@@ -144,6 +174,8 @@ 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 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"
@@ -154,10 +186,29 @@ 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'
+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

From 10e88bd791988ecec9c8c50cd1c85a37131de0e1 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Thu, 29 May 2014 10:51:49 +0200
Subject: [PATCH 23/31] add gbnm alias for non-merged branches inspired from
 #1982

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3821a2e4b..3b2d0aec9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -138,6 +138,8 @@ 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

From b167029a286087e1eb28aa041ce564f42703ea73 Mon Sep 17 00:00:00 2001
From: Yachi Lo <yaachi@gmail.com>
Date: Tue, 24 Sep 2013 15:25:03 +0800
Subject: [PATCH 24/31] bring back `git ls-files|grep $1` as a function, and
 add completion

---
 plugins/git/git.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3b2d0aec9..aca33f679 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -248,6 +248,9 @@ alias gignore='git update-index --assume-unchanged'
 alias gunignore='git update-index --no-assume-unchanged'
 # 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

From e2595c5ff5ec04dde4be01b610fbdce93664caae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20S=C3=A1nchez?= <esteban@ticketea.com>
Date: Wed, 11 Dec 2013 13:24:19 +0100
Subject: [PATCH 25/31] Avoid showing 'git rm' usage when using gwip alias

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index aca33f679..178d079d8 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -241,7 +241,7 @@ compdef _git ggpnp=git-checkout
 # Work In Progress (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
-alias gwip="git add -A; git ls-files --deleted -z | xargs ${XARGS_OPTS} -0 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'
 # Ignore changes to file
 alias gignore='git update-index --assume-unchanged'

From 92ee30e7be6b02dd7da6670d12832d657eef23cc Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 10 Jun 2014 10:08:44 +0200
Subject: [PATCH 26/31] Added aliases suggested by @santacruz123 fixes #2433

---
 plugins/git/git.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 178d079d8..1eee3451e 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -54,6 +54,8 @@ alias gdc='git diff --cached'
 compdef _git gdc=git-diff
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
+alias gbl='git blame -b -w'
+compdef _git gbl=git-blame
 # Pull
 alias gl='git pull'
 compdef _git gl=git-pull
@@ -160,6 +162,8 @@ 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'

From 81266ba5ad8133f1d0a1bbf2805d31234a6a62d9 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 10 Jun 2014 10:11:57 +0200
Subject: [PATCH 27/31] Added aliases suggested by @lucasuyezu fixes #2493

---
 plugins/git/git.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1eee3451e..b1a6e1100 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -47,6 +47,8 @@ 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
@@ -54,6 +56,8 @@ 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

From e13193b1ddfab700ee1d522003e22ee6c70bb86b Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 10 Jun 2014 13:58:46 +0200
Subject: [PATCH 28/31] improved readme readability

---
 README.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.textile b/README.textile
index 09742dfbe..e32a8cf97 100644
--- a/README.textile
+++ b/README.textile
@@ -22,7 +22,7 @@ The "@upstream-test@ branch":https://github.com/ncanceill/oh-my-zsh/tree/upstrea
 
 h3. Updating
 
-These branches are used to aggregate Pull Requests into categories. Please submit them to these branches, if applicable, instead of sending them directly upstream. This allows to keep the original repository clean.
+These branches are used to aggregate Pull Requests into categories. Please submit your PRs to these branches, if applicable, instead of sending them directly upstream. This allows to keep the original repository clean.
 
 h4. Plugins
 

From 363e56c7a697faee0014d577a963eb650be94632 Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Tue, 10 Jun 2014 15:05:06 +0200
Subject: [PATCH 29/31] added ggf alias to force ggp

---
 plugins/git/git.plugin.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index b1a6e1100..6152053b2 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -242,6 +242,11 @@ ggp() {
   git push origin "${b:=$1}"
 }
 compdef _git ggp=git-checkout
+ggf() {
+  [[ "$#" != 1 ]] && b="$(current_branch)"
+  git push --force origin "${b:=$1}"
+}
+compdef _git ggf=git-checkout
 ggpnp() {
   ggl "$1" && ggp "$1"
 }

From 0a02a4794dcb89b7566f0ebe406fc91455afce7a Mon Sep 17 00:00:00 2001
From: ncanceill <nicolas.canceill@ens-cachan.org>
Date: Sat, 4 Apr 2015 13:06:04 +0200
Subject: [PATCH 30/31] readme textile->markdown

---
 README.markdown | 34 ++++++++++++++++++++++++++++++++++
 README.textile  | 33 ---------------------------------
 2 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 README.markdown
 delete mode 100644 README.textile

diff --git a/README.markdown b/README.markdown
new file mode 100644
index 000000000..516411181
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,34 @@
+![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png)
+
+This is a fork of [**@robbyrussell**](https://github.com/robbyrussell)'s original project.
+
+## Contributing
+
+You can [fetch](https://help.github.com/articles/fork-a-repo) this repository in order to [participate in testing](#testing) or [aggregate pull requests](#updating) for upstream.
+
+## Branches
+
+There are various branches used to help with maintenance.
+
+You are on the **master** branch. I use it for my own OMZ installs, it is usually pretty close to upstream, you are welcome to take inspiration but I will not allow external changes.
+
+### Tracking
+
+The [**upstream-edge** branch](https://github.com/ncanceill/oh-my-zsh/tree/upstream-edge) tracks the bleeding edge upstream. It is used as a clean starting point for new Pull Requests.
+
+### Testing
+
+The [**upstream-test** branch](https://github.com/ncanceill/oh-my-zsh/tree/upstream-test) holds changes that need testing before merging.
+
+### Updating
+
+These branches are used to aggregate Pull Requests into categories. Please submit your PRs to these branches, if applicable, instead of sending them directly upstream. This allows to keep the original repository clean.
+
+#### Plugins
+
+- [**git**](https://github.com/ncanceill/oh-my-zsh/tree/plugin-git) -- [Submit PR](https://github.com/ncanceill/oh-my-zsh/pull/new/plugin-git)
+
+#### Other
+
+- [Easy-To-Merge](https://github.com/ncanceill/oh-my-zsh/tree/easymerge) -- [Submit PR](https://github.com/ncanceill/oh-my-zsh/pull/new/easymerge)
+
diff --git a/README.textile b/README.textile
deleted file mode 100644
index e32a8cf97..000000000
--- a/README.textile
+++ /dev/null
@@ -1,33 +0,0 @@
-!https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png!
-
-This is a fork of ["@robbyrussell":https://github.com/robbyrussell]'s original project.
-
-h2. Contributing
-
-You can "fetch":https://help.github.com/articles/fork-a-repo this repository in order to ["participate in testing":#testing] or ["aggregate pull requests":#updating] for upstream.
-
-h2. Branches
-
-There are various branches used to help with maintenance.
-
-You are on the @master@ branch. I use it for my own OMZ installs, it is usually pretty close to upstream, you are welcome to take inspiration but I will not allow external changes.
-
-h3. Tracking
-
-The "@upstream-edge@ branch":https://github.com/ncanceill/oh-my-zsh/tree/upstream-edge tracks the bleeding edge upstream. It is used as a clean starting point for new Pull Requests.
-
-h3. Testing
-
-The "@upstream-test@ branch":https://github.com/ncanceill/oh-my-zsh/tree/upstream-test holds changes that need testing before merging.
-
-h3. Updating
-
-These branches are used to aggregate Pull Requests into categories. Please submit your PRs to these branches, if applicable, instead of sending them directly upstream. This allows to keep the original repository clean.
-
-h4. Plugins
-
-* "@git@":https://github.com/ncanceill/oh-my-zsh/tree/plugin-git -- "Submit PR":https://github.com/ncanceill/oh-my-zsh/pull/new/plugin-git
-
-h4. Other
-
-* "Easy-To-Merge":https://github.com/ncanceill/oh-my-zsh/tree/easymerge -- "Submit PR":https://github.com/ncanceill/oh-my-zsh/pull/new/easymerge

From 4aee18931e7d0c638075a61cef3015a0950d18c6 Mon Sep 17 00:00:00 2001
From: Wayne <waynelkh0@gmail.com>
Date: Sun, 26 Apr 2015 03:52:00 +0800
Subject: [PATCH 31/31] Remove docker insert command

Remove the docker insert command of autocomplete
---
 plugins/docker/_docker | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index aadc9c61d..46cd9871d 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -91,11 +91,6 @@ __info() {
     # no arguments
 }
 
-__insert() {
-    __docker_images
-    _arguments '*:files:_files'
-}
-
 __inspect() {
     __docker_images
     __docker_containers
@@ -267,7 +262,6 @@ _1st_arguments=(
     "images":"List images"
     "import":"Create a new filesystem image from the contents of a tarball"
     "info":"Display system-wide information"
-    "insert":"Insert a file in an image"
     "inspect":"Return low-level information on a container"
     "kill":"Kill a running container"
     "load":"Load an image from a tar archive"
@@ -324,8 +318,6 @@ case "$words[1]" in
         __import ;;
     info)
         __info ;;
-    insert)
-        __insert ;;
     inspect)
         __inspect ;;
     kill)