Created
July 5, 2011 06:52
-
-
Save evolve2k/1064368 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh | |
| index cbc40a2..d25c2eb 100644 | |
| --- a/plugins/git.plugin.zsh | |
| +++ b/plugins/git.plugin.zsh | |
| @@ -2,7 +2,7 @@ | |
| alias g='git st' | |
| alias l='git log' | |
| alias d='git diff' | |
| -alias gl='git pull' | |
| +#alias gl='git pull' | |
| alias gup='git fetch && git rebase' | |
| alias gp='git push' | |
| alias gd='git diff | mate' | |
| @@ -32,4 +32,4 @@ function current_branch() { | |
| # these aliases take advangate of the previous function | |
| alias ggpull='git pull origin $(current_branch)' | |
| alias ggpush='git push origin $(current_branch)' | |
| -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' | |
| \ No newline at end of file | |
| +alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' | |
| diff --git a/themes/nathanscott.zsh-theme b/themes/nathanscott.zsh-theme | |
| index bde760e..bca5617 100644 | |
| --- a/themes/nathanscott.zsh-theme | |
| +++ b/themes/nathanscott.zsh-theme | |
| @@ -16,4 +16,4 @@ PROMPT=' | |
| %n@%m:%{%F{green}%}$PWD%{%F{red}%} | |
| %(?,%{%F{green}%},%{%F{red}%})✪%{$reset_color%} ' | |
| -RPROMPT='$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)' | |
| +RPROMPT='$(rvm_prompt_info)%{$reset_color%} $(git_cwd_info)' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment