Merge branch 'master' of github.com:unphased/oh-my-zsh into mine-master

This commit is contained in:
Steven Lu 2013-07-09 23:01:32 -04:00
commit c230d30d18
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@ alias please='sudo'
#alias g='grep -in' #alias g='grep -in'
# Show history # Show history
alias history='fc -l 1' # alias history='fc -l 1'
# List direcory contents # List direcory contents
alias lsa='ls -lah' alias lsa='ls -lah'

View file

@ -13,7 +13,7 @@ function myjobs() {
} }
if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then if [[ "$TERM" != "dumb" ]] && [[ "$DISABLE_LS_COLORS" != "true" ]]; then
PROMPT='%{$fg[red]%}%n%{$reset_color%}@%{$fg[green]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%} %{$fg[yellow]%}%w %T%{$fg[magenta]%} %!%{$reset_color%} PROMPT='%{$fg[red]%}%n%{$reset_color%}@%{$fg[green]%}%m%{$reset_color%}:%{$fg[blue]%}%~%{$reset_color%} %{$fg[yellow]%}%W %T%{$fg[magenta]%} %!%{$reset_color%}
$(myjobs)%(!.%{$fg[red]%}#.%{$fg[cyan]%})%{$reset_color%} ' $(myjobs)%(!.%{$fg[red]%}#.%{$fg[cyan]%})%{$reset_color%} '
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"