From 745fb848301f1e414b00a01536b1b60726e5741b Mon Sep 17 00:00:00 2001 From: Ryan McCuaig Date: Wed, 31 Aug 2011 15:45:30 -0700 Subject: [PATCH] Change git cherry-pick alias to 'gchp' If GNU coreutils are installed as gmv, gcp, etc. via Homebrew, and cp is aliased to gcp as is Homebrew's wont, then the tab completion for cp will fail oddly when the git plugin is enabled, since zsh is completing for `git cherry-pick` but executing `gcp`. --- 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 4fcf9425d..4092286a0 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -23,8 +23,8 @@ alias gba='git branch -a' compdef _git gba=git-branch alias gcount='git shortlog -sn' compdef gcount=git -alias gcp='git cherry-pick' -compdef _git gcp=git-cherry-pick +alias gchp='git cherry-pick' +compdef _git gchp=git-cherry-pick alias glg='git log --stat --max-count=5' compdef _git glg=git-log alias glgg='git log --graph --max-count=5'