From: Ben Beltran <redacted>
Date: Thu, 28 Mar 2013 20:54:19 +0000 (-0600)
Subject: Merge branch 'master' of github.com:benbeltran/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/3f77b12ec88ba42644d7e498434cba8ef9c9fe31

Merge branch 'master' of github.com:benbeltran/dotfiles
---

3f77b12ec88ba42644d7e498434cba8ef9c9fe31
diff --cc zshrc
index b649043,a18d284..29ae3ac
--- a/zshrc
+++ b/zshrc
@@@ -55,8 -55,10 +55,11 @@@ alias rspec="rspec --color
  
  #Screeninator and RVM scripts
  [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm
 +[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
  
+ bindkey -v
+ bindkey '^R' history-incremental-pattern-search-backward
+ 
  #
  # End of the custom things from my bash profile.
  # There's probably a more "zsh-ish" way of doing these, but I have no time.