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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	lib/git.zsh
This commit is contained in:
Gaetan Semet 2016-02-04 01:18:13 +01:00
commit 6000880f2d
38 changed files with 844 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/upgrade.sh
View file

@ -20,7 +20,7 @@ else
NORMAL=""
fi
printf "${BLUE}%s${NORMAL}\n" "Upgrading Oh My Zsh"
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
cd "$ZSH"
if git pull --rebase --stat origin master
then