.alias

#
# Git section
#

alias init="git init && git add . && git commit -m \"initial commit\""

# just the changes you've made to files beyond what has been marked for commit
alias dfwi="git diff"
# just the changes marked for commit
alias dfir="git diff --cached"
# all the changes since the last commit
alias dfwh="git diff HEAD"

alias add="git add"
alias addall="git add ."
alias addp="git add --patch"
alias push?='git cherry -v origin/master'

# dangerous commands
alias rebase="git rebase -i "
alias resolved="git rebase --continue"

# revert to index (arg:File)
alias revi="git checkout --"
# revert to head (arg:File)
alias revh="git checkout HEAD"


# Show last commit
alias last="git cat-file commit HEAD"
alias modified="git ls-files -m"

alias show-untracked="git clean -n -d"
alias delete-untracked="git clean -d"

alias grm="git ls-files -deleted | xargs git rm"
#alias append="git commit --amend"

alias conflict="git mergetool --tool=vimdiff"

#
# Misc
#
alias vimm="vim +Vexplore"
alias netstat="netstat -nal -p tcp && netstat -nal -p udp"
alias ..='cd ..'
alias =clear
alias clj="~/opt/ClojureX/clj"
#alias top="top -o cpu -S"


if [ "Darwin" = `uname` ]
then
    alias apachectl='sudo /opt/local/apache2/bin/apachectl'
    alias mysqlctl='sudo /opt/local/share/mysql5/mysql/mysql.server'
fi

alias geb="git_empty_branch"