Merge remote-tracking branch 'markrickert/master'

Conflicts:
	aliases/available/git.aliases.bash

aliases/available/git.aliases.bash

@@ -12,6 +12,7 @@ alias gs='git status'
 alias gss='git status -s'
 alias gl='git pull'
 alias gpr='git pull --rebase'
+alias gpp='git pull && git push'
 alias gup='git fetch && git rebase'
 alias gp='git push'
 alias gpo='git push origin'
@@ -28,6 +29,10 @@ alias gexport='git archive --format zip --output'
 alias gdel='git branch -D'
 alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
+alias gg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+alias ggs="gg --stat"
+alias gsl="git shortlog -sn"
+alias gw="git whatchanged"
 
 if [ -z "$EDITOR" ]; then
     case $OSTYPE in

aliases/available/osx.aliases.bash

@@ -23,3 +23,12 @@ fi
 
 # Requires growlnotify, which can be found in the Growl DMG under "Extras"
 alias grnot='growlnotify -s -t Terminal -m "Done"'
+
+# Get rid of those pesky .DS_Store files recursively
+alias dsclean='find . -type f -name .DS_Store -print0 | xargs -0 rm'
+
+# Track who is listening to your iTunes music
+alias whotunes='lsof -r 2 -n -P -F n -c iTunes -a -i TCP@`hostname`:3689'
+
+# Flush your dns cache
+alias flush='dscacheutil -flushcache'