From 8f7a5b5acb0ea07cd13af6680fe62ca708395c5f Mon Sep 17 00:00:00 2001
From: Bodaniel Jeanes <bjeanes@bos-imac.local>
Date: Tue, 9 Sep 2008 14:09:18 +1000
Subject: [PATCH] moved git related aliases into own file and added in some
 extra aliases for Dr Nic when he uses my machine

---
 bash_profile |  1 +
 bashrc       | 13 -------------
 gitaliases   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 gitaliases

diff --git a/bash_profile b/bash_profile
index 81402d5..f31afb7 100644
--- a/bash_profile
+++ b/bash_profile
@@ -1,2 +1,3 @@
 source ~/.git-completion.bash
 source ~/.bashrc
+source ~/.gitaliases
\ No newline at end of file
diff --git a/bashrc b/bashrc
index d1333c3..e52ce56 100644
--- a/bashrc
+++ b/bashrc
@@ -48,19 +48,6 @@ alias rlog='tail -f -0 ./log/*.log'
 alias ss='ruby ./script/server'
 alias sc='ruby ./script/console'
 
-# git stuff
-
-alias gs='git status'
-alias gd='git diff'
-alias gi='git init'
-alias ga='git add .'
-alias gc='git commit'
-alias gac='git commit -a'
-alias gps='git push origin master'
-alias gpl='git pull origin master'
-
-alias ignore_empty='find . \( -type d -empty \) -and \( -not -regex ./\.git.* \) -exec touch {}/.gitignore \;'
-
 # Gem Doc
 export GEMDIR=`gem env gemdir`
 gemdoc() {
diff --git a/gitaliases b/gitaliases
new file mode 100644
index 0000000..92d781f
--- /dev/null
+++ b/gitaliases
@@ -0,0 +1,44 @@
+# Dr Nic Compatibility Mode
+
+alias gst='git status'
+alias gl='git pull'
+alias gp='git push'
+alias gpa='git push-all' # see [alias] in ~/.gitconfig
+alias gd='git diff | mate'
+alias ga='git add'
+alias gcl='git config --list'
+alias gc='git commit -v'
+alias gca='git commit -v -a'
+alias gb='git branch'
+alias gbc='git branch --color'
+alias gba='git branch -a'
+alias gco='git checkout'
+alias gdc='git-svn dcommit'
+alias gk='gitk --all &'
+
+alias gpatch='git diff master -p'
+# alias up='sake git:update' - need to priorities origin vs git-svn
+function gpall() {
+  git push rubyforge master --tags
+  git push origin master --tags
+}
+alias gitrm="git stat | grep deleted | awk '{print $3}' | xargs git rm"
+alias gitx="open -b nl.frim.GitX"
+
+parse_git_branch() {
+  git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
+}
+PS1="\w\$(parse_git_branch) $ "
+                                
+# End Dr Nic Compatibility Mode
+                            
+# Bo's preferred aliases
+alias gs='gst'
+alias gi='git init'
+alias ga='git add .'
+alias gac='gca'
+alias gps='gp'
+alias gpl='gl'
+alias gpo='gp origin master'
+
+alias ignore_empty='find . \( -type d -empty \) -and \( -not -regex ./\.git.* \) -exec touch {}/.gitignore \;'
\ No newline at end of file