From 145814023bd2f20854a34d3ddb7533624a09d297 Mon Sep 17 00:00:00 2001 From: Vladimir Kochnev Date: Mon, 25 May 2015 19:46:38 +0300 Subject: [PATCH] Alias gdtr to git diff-tree `gdt` cannot be used for `git diff-tree` because this alias is being overriding later for `git difftool` so there is a conflict in names. I propose to do renaming for `git diff-tree` alias but not for `git difftool` alias because: 1) `gdt` alias may already been used by someone for `git difftol`. 2) We already have a `gmt` for `git mergetool` so having a `gdt` for `git difftool` is less surprising. --- 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 9da448814..06f5a41ad 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -7,8 +7,8 @@ alias gd='git diff' compdef _git gd=git-diff alias gdc='git diff --cached' compdef _git gdc=git-diff -alias gdt='git diff-tree --no-commit-id --name-only -r' -compdef _git gdc=git diff-tree --no-commit-id --name-only -r +alias gdtr='git diff-tree --no-commit-id --name-only -r' +compdef _git gdtr=git diff-tree --no-commit-id --name-only -r alias gl='git pull' compdef _git gl=git-pull alias gup='git pull --rebase'