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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-07-03 16:18:02 +02:00
commit ec49ae1a98
42 changed files with 333 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/git.zsh
View file

@ -2,7 +2,7 @@
function git_prompt_info() {
if [[ "$(command git config --get oh-my-zsh.hide-status)" != "1" ]]; then
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
fi
}