<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -6,7 +6,6 @@ alias d='date '\''+%a %b.%e %Y %l:%M%P'\'''
 alias g='git'
 alias gadd='git add -u &amp;&amp; git add . &amp;&amp; git status'
 alias gb='git branch -a -v'
-alias gci='git pull --rebase &amp;&amp; rake &amp;&amp; git push'
 alias gd='git diff'
 alias gdstart='god -c config/god/brad.god'
 alias ge='gedit'
@@ -15,32 +14,24 @@ alias gi='sudo gem install'
 alias giv='sudo gem install -v'
 alias gl='git pull --rebase'
 alias gp='git push'
-alias grq='git rebase origin/qualcomm'
 alias gs='git status'
-alias hgclean='hg status | grep -e '\''^\?'\'' | sed '\''s/^\?//'\'' | xargs -t rm -f'
-alias hgdi='hg diff --color=always --git | less -r'
-alias hgprecommit='hg pull &amp;&amp; rake features &amp;&amp; rake test'
 alias histg='history | grep'
 alias ls='ls -lsFh --color'
 alias migrate='rake db:migrate db:test:prepare'
-alias psg='ps aux | grep'
+alias psg='ps | grep'
 alias r='touch tmp/restart.txt'
 alias remigrate='rake db:migrate &amp;&amp; rake db:migrate:redo &amp;&amp; rake db:schema:dump db:test:prepare'
 alias rr='rake routes'
 alias rrg='rake routes | grep'
 alias sc='./script/console'
 alias sd='./script/dbconsole'
-alias sf='ruby_tu_rs functional'
 alias sg='./script/generate'
 alias ss='./script/server'
 alias sss='./script/server -p 3001'
 alias su='ruby_tu_rs unit'
 alias svnprecommit='git svn rebase &amp;&amp; rake features &amp;&amp; rake test'
 alias t='tail -n 1000 -f ./log/development.log'
-alias tf='ruby_test functional'
-alias ti='ruby_test integration'
-alias tu='ruby_test unit'
 alias tw='ttytter.pl -user=bradly -vcheck'
 alias x='xmodmap ~/.Xmodmap'
 alias xit='exit'
-
+ps -ef | awk '{print $2, $8}'</diff>
      <filename>bash_aliases</filename>
    </modified>
    <modified>
      <diff>@@ -3,10 +3,6 @@
 :sources: 
 - http://gems.rubyforge.org/
 - http://gems.github.com
-- http://gems.github.com
-- http://gems.github.com
-- http://gems.github.com
-- http://gems.github.com
 :backtrace: false
 :benchmark: false
 :update_sources: true</diff>
      <filename>gemrc</filename>
    </modified>
    <modified>
      <diff>@@ -23,10 +23,10 @@ end
 
 #if Object.const_defined? :RAILS_ROOT
   def cc
-    eval '@current_client = current_client = cc = Client.current_client = Client.find(:first)'
+    eval 'c = @current_client = current_client = cc = Client.current_client = Client.find(:first)'
   end
   def cu
-    eval '@current_user = current_user = cu = User.current_user = User.find(:first)'
+    eval 'u = @current_user = current_user = cu = User.current_user = User.find(:first)'
   end
 #end
 </diff>
      <filename>irbrc</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>9c697bbbdbf896e21f018aa5447340269ecd2a00</id>
    </parent>
  </parents>
  <author>
    <name>Bradly Feeley</name>
    <email>bradly@Bradly-Feeleys-MacBook-Pro.local</email>
  </author>
  <url>http://github.com/bradly/dot-files/commit/223a463a1563097b76490ee44f734add14bb971c</url>
  <id>223a463a1563097b76490ee44f734add14bb971c</id>
  <committed-date>2009-10-31T11:22:11-07:00</committed-date>
  <authored-date>2009-10-31T11:22:11-07:00</authored-date>
  <message>cleaning up some aliases I don't use</message>
  <tree>dac701b95fc01a3b372567be552462163cc5b807</tree>
  <committer>
    <name>Bradly Feeley</name>
    <email>bradly@Bradly-Feeleys-MacBook-Pro.local</email>
  </committer>
</commit>
