Cleaned up git aliases

git/git.sh

@@ -1,3 +1,4 @@
+alias gi='git init'
 alias gst='git status'
 alias gl='git pull --rebase'
 alias gp='git push'
@@ -6,36 +7,21 @@ 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 gb='git branch --color'
-alias gbc='git branch --color'
+alias gba='gb -a'
-alias gba='git branch -a'
 alias gco='git checkout'
 alias gdc='git-svn dcommit'
 alias gk='gitk --all &'
+alias gx="open -b nl.frim.GitX"
+alias grm="git stat | grep deleted | awk '{print $3}' | xargs git rm"
+alias gpatch='git diff master -p'
+alias ignore_empty='find . \( -type d -empty \) -and \( -not -regex ./\.git.* \) -exec touch {}/.gitignore \;'
 
 function gd() {
   git diff $* | mate
 }
 
-alias gpatch='git diff master -p'
+if [[ -d "/usr/local/git" ]]; then
-# alias up='sake git:update' - need to priorities origin vs git-svn
+  PATH="/usr/local/git/bin:$PATH"
-function gpall() {
+  MANPATH="/usr/local/git/man:$MANPATH"
-  git push rubyforge master --tags
+fi
-  git push origin master --tags
-}
-alias gitrm="git stat | grep deleted | awk '{print $3}' | xargs git rm"
-alias gitx="open -b nl.frim.GitX"
-                                
-# End Dr Nic Compatibility Mode
-                            
-# Bo's preferred aliases
-alias gi='git init'
-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 \;'
-
-export PATH=/usr/local/git/bin:$PATH
-export MANPATH=/usr/local/git/man:$MANPATH