From 11b595516167927b70d182ab8d38257c9e86cfc3 Mon Sep 17 00:00:00 2001
From: David DeSandro <david@desandro.com>
Date: Mon, 20 Jun 2011 16:13:34 -0400
Subject: [PATCH 1/2] Revert "move garb into git plugins; rename newpost as
 jknewpost"

This reverts commit d22a4cfa7058b224e37dbf07aa7cd3c583fdd188.
---
 aliases/available/git.aliases.bash    | 7 +++++++
 plugins/available/git.plugins.bash    | 8 +-------
 plugins/available/jekyll.plugins.bash | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 7cfc9d93..3a5d2a9f 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -39,6 +39,13 @@ case $OSTYPE in
     ;;
 esac
 
+# git add remote branch
+function garb() {
+  echo "Adding remote branch '$1'";
+  git config branch.$1.remote origin;
+  git config branch.$1.merge refs/heads/$1;
+}
+
 function git-help() {
   echo "Git Custom Aliases Usage"
   echo
diff --git a/plugins/available/git.plugins.bash b/plugins/available/git.plugins.bash
index 3fbdac61..b0b9ce8c 100644
--- a/plugins/available/git.plugins.bash
+++ b/plugins/available/git.plugins.bash
@@ -5,13 +5,6 @@ function git_remote {
   git remote add origin $GIT_HOSTING:$1.git
 }
 
-# git add remote branch
-function garb() {
-  echo "Adding remote branch '$1'";
-  git config branch.$1.remote origin;
-  git config branch.$1.merge refs/heads/$1;
-}
-
 function git_first_push {
   echo "Running: git push origin master:refs/heads/master"
   git push origin master:refs/heads/master
@@ -99,3 +92,4 @@ else
     echo "you're currently not in a git repository"
 fi
 }
+
diff --git a/plugins/available/jekyll.plugins.bash b/plugins/available/jekyll.plugins.bash
index 3b96f451..aebe69bc 100644
--- a/plugins/available/jekyll.plugins.bash
+++ b/plugins/available/jekyll.plugins.bash
@@ -26,7 +26,7 @@ editpost() {
 	fi
 }
 
-jknewpost() {
+newpost() {
 
 	# 'builtin cd' into the local jekyll root
 

From 4a8e08e7832fe4480ca4bf9db7a7778dc0478400 Mon Sep 17 00:00:00 2001
From: David DeSandro <david@desandro.com>
Date: Mon, 20 Jun 2011 16:13:59 -0400
Subject: [PATCH 2/2] Revert "Add various aliases"

This reverts commit 3ef689f29a777f8a076b4a7032ca46f4ba331106.
---
 aliases/available/general.aliases.bash | 9 ---------
 aliases/available/git.aliases.bash     | 7 +------
 aliases/available/jekyll.aliases.bash  | 3 ---
 aliases/available/osx.aliases.bash     | 1 -
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 2ed9d134..79bd7aa0 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -46,15 +46,6 @@ alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
 alias	md='mkdir -p'
 alias	rd=rmdir
 
-# show / hide hidden files
-alias showhidden="defaults write com.apple.finder AppleShowAllFiles TRUE; killall Finder"
-alias hidehidden="defaults write com.apple.finder AppleShowAllFiles FALSE; killall Finder"
-# display IP address
-alias myip="echo ethernet:; ipconfig getifaddr en0; echo wireless:; ipconfig getifaddr en1"
-
-# http://snippets.dzone.com/posts/show/2486
-alias killsvn="find . -name ".svn" -type d -exec rm -rf {} \;"
-
 function aliases-help() {
   echo "Generic Alias Usage"
   echo
diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 3a5d2a9f..45d7d05f 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -39,12 +39,7 @@ case $OSTYPE in
     ;;
 esac
 
-# git add remote branch
-function garb() {
-  echo "Adding remote branch '$1'";
-  git config branch.$1.remote origin;
-  git config branch.$1.merge refs/heads/$1;
-}
+
 
 function git-help() {
   echo "Git Custom Aliases Usage"
diff --git a/aliases/available/jekyll.aliases.bash b/aliases/available/jekyll.aliases.bash
index feaf245a..e52c0351 100644
--- a/aliases/available/jekyll.aliases.bash
+++ b/aliases/available/jekyll.aliases.bash
@@ -18,6 +18,3 @@ alias buildsite="builtin cd $JEKYLL_LOCAL_ROOT && rm -rf _site/ && jekyll"
 # Rsync the site to the remote server
 
 alias deploysite="builtin cd $JEKYLL_LOCAL_ROOT && rsync -rz _site/ $JEKYLL_REMOTE_ROOT"
-
-alias jkas="jekyll --auto --server"
-alias rmjkas="rm -rf _site/* && jkas"
\ No newline at end of file
diff --git a/aliases/available/osx.aliases.bash b/aliases/available/osx.aliases.bash
index d25c0511..e0746952 100644
--- a/aliases/available/osx.aliases.bash
+++ b/aliases/available/osx.aliases.bash
@@ -14,7 +14,6 @@ alias dashcode="open -a dashcode"
 alias f='open -a Finder '
 alias textedit='open -a TextEdit'
 alias hex='open -a "Hex Fiend"'
-alias gitx="open -a GitX"
 
 if [ -s /usr/bin/firefox ] ; then
   unalias firefox