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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
This commit is contained in:
Gaetan Semet 2015-08-10 16:15:53 +02:00
commit 9a63084e20
82 changed files with 2488 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ function jump()
function mark()
{
if (( $# == 0 )); then
if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then
MARK=$(basename "$(pwd)")
else
MARK="$1"