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

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2014-11-24 13:43:37 +01:00
commit a32d89278a
38 changed files with 563 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/common-aliases/common-aliases.plugin.zsh
View file

@ -54,7 +54,6 @@ alias ff='find . -type f -name'
alias h='history'
alias hgrep="fc -El 0 | grep"
alias help='man'
alias j='jobs'
alias p='ps -f'
alias sortnr='sort -n -r'
alias unexport='unset'