From 5c54fcd169a5bf8600c134ed85cbe672a600caf6 Mon Sep 17 00:00:00 2001
From: Yan Pritzker <yan@pritzker.ws>
Date: Fri, 9 Nov 2012 13:40:16 -0600
Subject: [PATCH] A few new git aliases

---
 vim/plugin/settings/ctrlp.vim | 1 +
 zsh/aliases.zsh               | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/vim/plugin/settings/ctrlp.vim b/vim/plugin/settings/ctrlp.vim
index f9f8df9..18ce19f 100644
--- a/vim/plugin/settings/ctrlp.vim
+++ b/vim/plugin/settings/ctrlp.vim
@@ -1,4 +1,5 @@
 let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
+let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . --cached --exclude-standard --others']
 
 " Default to filename searches - so that appctrl will find application
 " controller
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index c0fa402..09d9320 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -97,6 +97,8 @@ alias gsm='git submodule'
 alias gsmi='git submodule init'
 alias gsmu='git submodule update'
 alias gt='git t'
+alias gbg='git bisect good'
+alias gbb='git bisect bad'
 
 # Common shell functions
 alias less='less -r'
@@ -110,7 +112,7 @@ alias cl='clear'
 alias gz='tar -zcvf'
 
 # Ruby
-alias c='pry -r ./config/environment' # Rails 3
+alias c='rails c' # Rails 3
 alias co='script/console --irb=pry' # Rails 2
 alias ts='thin start'
 alias ms='mongrel_rails start'