From a6e1ddc4712f87fdc8e573cb4ae7f861916ebdc4 Mon Sep 17 00:00:00 2001
From: Proctor <steven.proctor@gmail.com>
Date: Tue, 5 Nov 2013 08:45:07 -0600
Subject: [PATCH] first pass at adding aliases for common commands

---
 .bash_profile | 14 ++++++++------
 bash/aliases  | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 bash/aliases

diff --git a/.bash_profile b/.bash_profile
index 4c60dd8..2af787c 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,4 +1,5 @@
-"$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+
 PATH=/usr/local/bin:~/bin:/usr/local/share/npm/bin:$PATH
 PATH=$PATH:$HOME
 set -o vi
@@ -9,10 +10,6 @@ if [ -f $(brew --prefix)/etc/bash_completion ]; then
   . $(brew --prefix)/etc/bash_completion
 fi
 
-if [ -f ~/.bash_local ]; then
-  . ~/.bash_local
-fi
-
 # came from Aaron Lasseigne (AaronLasseigne on GitHub)
 battery_status()
 {
@@ -39,5 +36,10 @@ battery_status()
   fi
 }
 
-export PROMPT_COMMAND='PS1="$(battery_status) [\d \t] \h:\W \u\$ "'
+export PROMPT_COMMAND='PS1="[\d \t] \h:\W \u\$ "'
 
+source ~/.bash/aliases
+
+if [ -f ~/.bash_local ]; then
+  . ~/.bash_local
+fi
diff --git a/bash/aliases b/bash/aliases
new file mode 100644
index 0000000..5feaf71
--- /dev/null
+++ b/bash/aliases
@@ -0,0 +1,17 @@
+
+#standard shell aliases
+alias ll='ls -l'
+alias la='ls -a'
+alias lhal='ls -hal'
+
+#git aliases
+alias ?='git status'
+alias ga='git add'
+alias gaa='git add .'
+alias gco='git checkout'
+alias gc='git commit'
+alias gpush='git push'
+alias gpull='git pull'
+alias gdiff='git diff'
+alias merged?='git branch --merged'
+alias gbd='git branch -d'