From 0cfec65383e542f165132c9f8983ebfb666f1b62 Mon Sep 17 00:00:00 2001 From: Mark Rickert Date: Tue, 9 Apr 2013 09:14:40 -0400 Subject: [PATCH 1/2] Added OSX utility shortcuts .DS_Store cleaner (recursive) See who's connected to your itunes library Flush dns cache. --- aliases/available/osx.aliases.bash | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/aliases/available/osx.aliases.bash b/aliases/available/osx.aliases.bash index e234727d..3d82b500 100644 --- a/aliases/available/osx.aliases.bash +++ b/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' From 8be156fc8b3e1d5ebd2268781a91335fb6c850dd Mon Sep 17 00:00:00 2001 From: Mark Rickert Date: Tue, 9 Apr 2013 09:15:48 -0400 Subject: [PATCH 2/2] Added some awesome git aliases for statistics, history, and seeing what changed. --- aliases/available/git.aliases.bash | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 75b8f65c..9a9a1060 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -11,6 +11,7 @@ alias gst='git status' alias gs='git status' alias gss='git status -s' alias gl='git pull' +alias gpp='git pull && git push' alias gup='git fetch && git rebase' alias gp='git push' alias gpo='git push origin' @@ -27,6 +28,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