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

Merge remote-tracking branch 'cadusk/master'

Browse source 
Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
This commit is contained in:
Gaetan Semet 2014-03-24 11:56:16 +01:00
commit 92ed38cb85
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/zshrc-mac.zsh
View file

@ -46,14 +46,12 @@ zstyle ':completion:*:descriptions' format '%B%d%b'
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# MacOSX specific aliases
alias bu='brew update && brew upgrade'
source $ZSH/oh-my-zsh.sh
unsetopt correctall