Merge branch 'master' of github.com:aarongut/dotfiles into material

Conflicts: .vimrc
2016-09-13 00:23:42 -04:00
parent 9a6e7103be 1f26a09384
commit dc3ea0aa1e
7 changed files with 13 additions and 3 deletions
--- a/.zshrc
+++ b/.zshrc
@@ -41,6 +41,7 @@ alias ocamldebug='rlwrap ocamldebug'
 alias rm='rm -i'
 alias shell='ps -p $$ -o comm='
 alias sml='rlwrap sml'
+alias sshp='ssh -o PubkeyAuthentication=no'
 alias style='clang-format-3.5 -style=Google'
 alias telnet='rlwrap telnet'