linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'ashleydev/master' into mergetest

Browse source 
Conflicts:
	custom/aliases.zsh
	plugins/git/git-prompt-old.plugin.zsh
This commit is contained in:
Locojay 2011-06-05 20:32:03 -04:00
commit abd3427aef
7 changed files with 838 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

8
custom/aliases.zsh
View file

@ -46,9 +46,17 @@ alias print-libpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
alias lsbom='lsbom -f -l -s -pf'
#alias t="$HOME/.local/bin/t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
<<<<<<< HEAD
#alias v.='vim .'
#alias v='vim ~/.vimrc'
#alias VS='vim -S Session.vim'
=======
alias v.='vim .'
alias v='vim ~/.vimrc'
alias VS='vim -S Session.vim'
alias z='vim -o ~/.zshenv ~/.oh-my-zsh/custom/aliases.zsh ~/.zshrc'
>>>>>>> ashleydev/master
alias zs='source ~/.zshrc'