linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 15629055ca into 8c45b73918

Browse source
This commit is contained in:
GitHub Merge Button 2012-01-04 10:21:41 -08:00
commit 8f3050f48c
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/git/git.plugin.zsh
View file

@ -36,6 +36,8 @@ alias ga='git add'
compdef _git ga=git-add compdef _git ga=git-add
alias gm='git merge' alias gm='git merge'
compdef _git gm=git-merge compdef _git gm=git-merge
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
compdef _git grm=git-rm
# Git and svn mix # Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

28
themes/two-lines.zsh-theme Normal file
View file

@ -0,0 +1,28 @@
local magenta=$fg[magenta]
local blue=$fg[blue]
local red=$fg[red]
local green=$fg[green]
# Show a unicode character representing your current ruby VM.
function _show_rvm_prompt() {
local rvm_char
if [ -x "${HOME}/.rvm/bin/rvm-prompt" ]; then
rvm_char=`${HOME}/.rvm/bin/rvm-prompt u 2>/dev/null`
[ -n "${rvm_char}" ] && echo "${rvm_char} "
fi
}
local return_code="%(?..%{$red%}%? ↵%{$reset_color%})"
PROMPT='%{$magenta%}%n@%m%{$reset_color%}: %{$blue%}%~ $(git_prompt_info)%{$reset_color%}
$(_show_rvm_prompt)> '
RPS1="${return_code}"
ZSH_THEME_GIT_PROMPT_PREFIX="("
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$blue%})"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$red%}*%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$green%}?"
ZSH_THEME_GIT_PROMPT_CLEAN=""