merge fixes
git-svn-id: http://photonzero.com/dotfiles/trunk@115 23f722f6-122a-0410-8cef-c75bd312dd78
This commit is contained in:
parent
8c1d4265bd
commit
dd6a5dac7f
5 changed files with 9 additions and 4 deletions
|
|
@ -46,7 +46,7 @@ alias la='ls -alF'
|
|||
alias vi='vim'
|
||||
alias em='emacs'
|
||||
alias grep="grep --color=auto"
|
||||
alias screen="screen -R"
|
||||
#alias screen="screen -R"
|
||||
alias dvtm="dvtm -m \"^w\""
|
||||
alias tm="tmux -2 attach"
|
||||
alias ppjson="python -mjson.tool"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue