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.
This commit is contained in:
Lee Savide 2015-09-04 12:43:53 -05:00
parent f2a826e963
commit afeea8d2df
No known key found for this signature in database
GPG key ID: 293CF9E05CF987C3

View file

@ -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'