From ae6e6badd82bdcca55e364a440061e2a8859e8dc Mon Sep 17 00:00:00 2001 From: Konstantin Gribov Date: Tue, 10 Sep 2013 15:32:38 +0400 Subject: [PATCH 1/4] Removed extra `gd` alias definition in git plugin --- plugins/git/git.plugin.zsh | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d8ea3ae0c..29c89ea0b 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' From 943797cd4590ecc42a89daef4a4be4364a064319 Mon Sep 17 00:00:00 2001 From: Konstantin Gribov Date: Thu, 26 Sep 2013 23:39:07 +0400 Subject: [PATCH 2/4] Added alias `gbv` -- `git branch -av` to git --- 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 29c89ea0b..56c8e8bc7 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -50,6 +50,8 @@ alias gb='git branch' compdef _git gb=git-branch alias gba='git branch -a' compdef _git gba=git-branch +alias gbv='git branch -av' +compdef _git gbv=git-branch alias gcount='git shortlog -sn' compdef gcount=git alias gcl='git config --list' From eb5d726c7dd79871a6e469e59fa6a6d289186360 Mon Sep 17 00:00:00 2001 From: Konstantin Gribov Date: Thu, 26 Sep 2013 23:39:58 +0400 Subject: [PATCH 3/4] Added alias `gai` -- `git add -p` to git --- 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 56c8e8bc7..68bbe4fe0 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -69,6 +69,8 @@ alias gss='git status -s' compdef _git gss=git-status alias ga='git add' compdef _git ga=git-add +alias gai='git add -p' +compdef _git gai=git-add alias gm='git merge' compdef _git gm=git-merge alias grh='git reset HEAD' From 33e9bc01e0d212530fa395491c30981ca0138c66 Mon Sep 17 00:00:00 2001 From: Konstantin Gribov Date: Thu, 26 Sep 2013 23:40:28 +0400 Subject: [PATCH 4/4] Added alias `gq` -- `qgit --all` to git --- 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 68bbe4fe0..7a8fb15c3 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -88,6 +88,7 @@ compdef _git gm=git-mergetool alias gg='git gui citool' alias gga='git gui citool --amend' alias gk='gitk --all --branches' +alias gq='qgit --all' alias gsts='git stash show --text' # Will cd into the top of the current repository