From 7b989ee510c74d9bdfe5bad6549c9b6f0ec7e9c9 Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@sheknows.com>
Date: Fri, 12 Oct 2012 17:03:58 -0700
Subject: [PATCH] subversion and bash aliases, fixed git aliases

---
 bash/bash_aliases.d/git.sh  | 4 +++-
 bash/bash_aliases.d/misc.sh | 2 ++
 bash/bash_aliases.d/svn.sh  | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 bash/bash_aliases.d/misc.sh
 create mode 100644 bash/bash_aliases.d/svn.sh

diff --git a/bash/bash_aliases.d/git.sh b/bash/bash_aliases.d/git.sh
index 718ea09..b110fa9 100644
--- a/bash/bash_aliases.d/git.sh
+++ b/bash/bash_aliases.d/git.sh
@@ -1,3 +1,4 @@
+alias gf='git fetch'
 alias gs='git status -sb'
 alias ga='git add'
 alias gaa='git add --all'
@@ -5,11 +6,12 @@ alias gu='git add -u'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
 alias gp='git push'
-alias gpl='git pull'
+alias gpl='git pull --rebase'
 alias gme='git merge'
 alias gb='git branch'
 alist gst='git stash'
 alias gco='git checkout'
+alias gst='git stash'
 alias gr='git remote'
 alias gd='git diff'
 alias gph='git push heroku'
diff --git a/bash/bash_aliases.d/misc.sh b/bash/bash_aliases.d/misc.sh
new file mode 100644
index 0000000..e121165
--- /dev/null
+++ b/bash/bash_aliases.d/misc.sh
@@ -0,0 +1,2 @@
+alias ..='cd ..'
+alias ...='cd ..; cd ..'
diff --git a/bash/bash_aliases.d/svn.sh b/bash/bash_aliases.d/svn.sh
new file mode 100644
index 0000000..5d052fb
--- /dev/null
+++ b/bash/bash_aliases.d/svn.sh
@@ -0,0 +1,5 @@
+alias sa='svn add'
+alias sd='svn diff -x -w'
+alias ss='svn status'
+alias sr='svn revert'
+alias sc='svn commit'