From cf3a03d45e6b4eb642238bbd7b6aeca1fd1bc868 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Sun, 5 May 2013 16:35:40 +0800
Subject: rm alias gcm='git checkout master' and add alias gcm='git commit -m'

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

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..5277abc99 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -22,9 +22,10 @@ alias gca='git commit -v -a'
 compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
+alias gcm='git commit -m'
+compdef _git gcm=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
-alias gcm='git checkout master'
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'
-- 
cgit v1.2.3-70-g09d2


From b36c42b76d5bb06e1a19b534177ad4980bc3b025 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Wed, 8 May 2013 17:03:07 +0800
Subject: rename gcm to gcmsg and stand for 'git commit -m'

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

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5277abc99..bcbd0897c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -22,7 +22,7 @@ alias gca='git commit -v -a'
 compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
-alias gcm='git commit -m'
+alias gcmsg='git commit -m'
 compdef _git gcm=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
-- 
cgit v1.2.3-70-g09d2


From 22dce9e71594d1cf191cd41cef845a34621826f8 Mon Sep 17 00:00:00 2001
From: simlegate <simlegate@163.com>
Date: Thu, 9 May 2013 12:57:32 +0800
Subject: add git alias 'gcmsg' and stand for 'git commit -m'

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

(limited to 'plugins/git')

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bcbd0897c..b30c4b99a 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -23,9 +23,10 @@ compdef _git gc=git-commit
 alias gca!='git commit -v -a --amend'
 compdef _git gca!=git-commit
 alias gcmsg='git commit -m'
-compdef _git gcm=git-commit
+compdef _git gcmsg=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
+alias gcm='git checkout master'
 alias gr='git remote'
 compdef _git gr=git-remote
 alias grv='git remote -v'
-- 
cgit v1.2.3-70-g09d2


From 05d8fdf3d54af3243e5891d13969a766bd9570a1 Mon Sep 17 00:00:00 2001
From: Brent Theisen <brent@bantamlabs.com>
Date: Tue, 9 Jul 2013 23:15:43 -0500
Subject: Copy and paste of two functions from Ubuntu 13.04's version of
 /usr/share/zsh/functions/Completion/Unix/_git that were referenced in
 46f0d8d. Fixes #1952.

---
 plugins/git/_git-branch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'plugins/git')

diff --git a/plugins/git/_git-branch b/plugins/git/_git-branch
index 86d03bc30..6b9c1a483 100644
--- a/plugins/git/_git-branch
+++ b/plugins/git/_git-branch
@@ -60,3 +60,24 @@ _git-branch ()
     "($l $c $m -d)-D[delete a branch]" \
     $dependent_deletion_args
 }
+
+(( $+functions[__git_ignore_line] )) ||
+__git_ignore_line () {
+  declare -a ignored
+  ignored=()
+  ((CURRENT > 1)) &&
+    ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  ((CURRENT < $#line)) &&
+    ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+  $* -F ignored
+}
+
+(( $+functions[__git_ignore_line_inside_arguments] )) ||
+__git_ignore_line_inside_arguments () {
+  declare -a compadd_opts
+
+  zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F:
+
+  __git_ignore_line $* $compadd_opts
+}
+
-- 
cgit v1.2.3-70-g09d2