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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2015-04-22 18:22:55 +02:00
commit fdbecb80e3
91 changed files with 2617 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/jump/jump.plugin.zsh
View file

@ -46,7 +46,6 @@ function unmark()
rm -i "$MARKPATH/$1"
}
autoload colors
function marks()
{
if [[ -d $MARKPATH ]]; then