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

Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Browse source 
Resolved conflicts:
	lib/completion.zsh
	lib/git.zsh
	lib/key-bindings.zsh
This commit is contained in:
alexg0 2010-07-27 13:48:26 -05:00
commit 3891809bed
49 changed files with 581 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/git.zsh
View file

@ -16,7 +16,7 @@ function git_prompt_info() {
}
parse_git_dirty () {
if [[ $((git status 2> /dev/null) | tail -n1) != "nothing to commit (working directory clean)" ]]; then
if [[ -n $(git status -s 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
@ -43,3 +43,4 @@ function current_branch_for_display() {
branch=$(current_branch) || return
echo ${branch/master/M} # master abbreviated to M.
}