From afeea8d2dfe714e10cd8ebdaf35952ef3a34f362 Mon Sep 17 00:00:00 2001 From: Lee Savide Date: Fri, 4 Sep 2015 12:43:53 -0500 Subject: [PATCH] Rename git module's alias from grc to grr. Alias grc causes a conflict with the Generic Colourizer command, grc, causing anything in prezto that grc applies to, such as running make, to instantly fail when the git alias takes precedence. P.S. Even if this doesn't get merged, the only reason I used 'grr' was to fix the issue on my machine. If there's any other alias that could be more suited to this command, feel free to change it. --- modules/git/alias.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index ffa854dd..b071dc00 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -127,7 +127,7 @@ alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push orig # Rebase (r) alias gr='git rebase' alias gra='git rebase --abort' -alias grc='git rebase --continue' +alias grr='git rebase --continue' alias gri='git rebase --interactive' alias grs='git rebase --skip'