From d58e96e2a80c4b29d537aef5c0d9cf22725db1dd Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Wed, 9 Mar 2011 11:55:08 -0500
Subject: [PATCH] bash_aliases looks for .bash_aliases.local to source

---
 bash_aliases | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bash_aliases b/bash_aliases
index 6d9b678..3fcc8e5 100755
--- a/bash_aliases
+++ b/bash_aliases
@@ -94,4 +94,9 @@ if [[ "$(which jsvn)" != "" ]]; then
     alias svn='jsvn'
 fi
 
-# local
+# source any machine-local aliases
+# this way ~/.bash_aliases can be a symlink to a version-controlled
+# aliases file
+if [ -f ~/.bash_aliases.local ]; then
+    . ~/.bash_aliases.local
+fi