Permalink
Browse files

altering git path for homebrew install and rvm

  • Loading branch information...
1 parent 07f7894 commit caaf85f868257a6e9a251baa2abf7f056743ed78 @tclem committed Feb 16, 2011
Showing with 11 additions and 7 deletions.
  1. +6 −2 git/aliases.zsh
  2. +4 −4 zsh/prompt.zsh
  3. +1 −1 zsh/zshrc.symlink
View
@@ -9,17 +9,21 @@
# syntax is way too slow). It should work fine for those without rvm, though.
if [[ -s $HOME/.rvm/scripts/rvm ]]
then
- alias git='$HOME/.rvm/rubies/ruby-1.8.7-p302/bin/ruby `which hub`'
+ # alias git='$HOME/.rvm/rubies/ruby-1.8.7-p302/bin/ruby `which hub`'
+ alias git='$HOME/.rvm/rubies/ruby-1.8.7-p330/bin/ruby `which hub`'
fi
# The rest of my fun git aliases
+alias ga='git add .'
alias gl='git pull --rebase --prune'
alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
alias gp='git push origin HEAD'
alias gd='git diff'
alias gc='git commit'
+alias gitc='git commit -m'
alias gca='git commit -a'
alias gco='git checkout'
alias gb='git branch'
-alias gs='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
+alias gss='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
+alias gs='git status' # upgrade your git if -sb breaks for you. it's fun.
alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
View
@@ -3,11 +3,11 @@ autoload colors && colors
# http://github.com/ehrenmurdick/config/blob/master/zsh/prompt.zsh
git_branch() {
- echo $(/usr/bin/git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'})
+ echo $(git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'})
}
git_dirty() {
- st=$(/usr/bin/git status 2>/dev/null | tail -n 1)
+ st=$(git status 2>/dev/null | tail -n 1)
if [[ $st == "" ]]
then
echo ""
@@ -22,7 +22,7 @@ git_dirty() {
}
git_prompt_info () {
- ref=$(/usr/bin/git symbolic-ref HEAD 2>/dev/null) || return
+ ref=$(git symbolic-ref HEAD 2>/dev/null) || return
# echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
echo "${ref#refs/heads/}"
}
@@ -38,7 +38,7 @@ project_name_color () {
}
unpushed () {
- /usr/bin/git cherry -v origin/$(git_branch) 2>/dev/null
+ git cherry -v origin/$(git_branch) 2>/dev/null
}
need_push () {
View
@@ -2,7 +2,7 @@
export ZSH=$HOME/.dotfiles
# your project folder that we can `c [tab]` to
-export PROJECTS=~/Development
+export PROJECTS=/Volumes/GitHub
# source every .zsh file in this rep
for config_file ($ZSH/**/*.zsh) source $config_file

0 comments on commit caaf85f

Please sign in to comment.