git: default to upstream when merging

[dotfiles.git] / zsh / themes / ramsi.zsh-theme

diff --git a/zsh/themes/ramsi.zsh-theme b/zsh/themes/ramsi.zsh-theme
index e0d852f794005a280f765aee531a3328eed409cc..8964a07c46bbea6aaa9cc6ff5b7d9e967c2cde61 100644 (file)
--- a/zsh/themes/ramsi.zsh-theme
+++ b/zsh/themes/ramsi.zsh-theme
@@ -1,5 +1,5 @@
-[[ $(hostname) == "tardis" ]] && hostcolor=red
-[[ $(hostname) == "shada" ]]  && hostcolor=green
+[[ $(hostname) == "tardis" ]]  && hostcolor=red
+[[ $(hostname) == "shada" ]]   && hostcolor=green

 PROMPT='%(?..%{$fg_bold[white]%}[%?])%{$reset_color%}[%D{%k:%M} %n@%{$fg[$hostcolor]%}%m%{$reset_color%}$(git_prompt_info)]%# '
 RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
 
 PROMPT='%(?..%{$fg_bold[white]%}[%?])%{$reset_color%}[%D{%k:%M} %n@%{$fg[$hostcolor]%}%m%{$reset_color%}$(git_prompt_info)]%# '
 RPROMPT='%{$fg[green]%}%~%{$reset_color%}'