diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh index 655eaf728..d012ca71d 100644 --- a/plugins/git.plugin.zsh +++ b/plugins/git.plugin.zsh @@ -1,15 +1,21 @@ # Aliases alias g='git' -alias gst='git status' -alias gl='git pull' -alias gup='git fetch && git rebase' -alias gp='git push' -alias gd='git diff | mate' -alias gdv='git diff -w "$@" | vim -R -' -alias gc='git commit -v' -alias gca='git commit -v -a' +alias ga='git add' alias gb='git branch' alias gba='git branch -a' +alias gbd='git branch -d' +alias gbr='git branch -r' +alias gc='git commit -v' +alias gca='git commit -v -a' +alias gco='git checkout' +alias gcob='git checkout -b' +alias gd='git diff | mate' +alias gdv='git diff -w "$@" | vim -R -' +alias gl='git pull' +alias gp='git push' +alias gs='git status' +alias grm='git status | grep deleted | awk "{print \$3}" | xargs git rm' +alias gup='git fetch && git rebase' alias gcount='git shortlog -sn' alias gcp='git cherry-pick' diff --git a/plugins/osx.plugin.zsh b/plugins/osx.plugin.zsh index fce88c796..45d8ecf21 100644 --- a/plugins/osx.plugin.zsh +++ b/plugins/osx.plugin.zsh @@ -8,4 +8,41 @@ function tab() { do script with command "cd \"$PWD\"; $*" in window 1 end tell EOF -} \ No newline at end of file +} + +# OSX doesn't have wget +alias wget='curl -O' + +# Postgres for Mac OS X +if [ -x /usr/local/pgsql ]; then + export PATH=/usr/local/pgsql/bin:$PATH +fi + +# Macports for Mac OS X +if [ -x /opt/local/bin/port ]; then + export PATH=/opt/local/bin:/opt/local/sbin:$PATH + export MANPATH=/opt/local/share/man:$MANPATH + + alias Pg='sudo port -v install' + alias Ps='port search' + alias Pi='port info' + alias Pr='sudo port uninstall' + alias dsl='port installed | grep -i' + + function InitMacports () { + cmds=( + cat chgrp chmod chown cp dd df diff du false head + ln ls mkdir mkfifo mv pwd rm rmdir sleep sort + stat tail tee true uniq who whoami yes + ) + + for cmd in $cmds; do + ln -vs /opt/local/bin/g$cmd /usr/local/bin/$cmd + done + } +fi + +# Fink for Mac OS X +if [ -x /sw/bin/init.sh ]; then + _append_to_path /sw/bin/init.sh +fi \ No newline at end of file