Merge branch 'master' of github.com:revans/bash-it

aliases/available/emacs.aliases.bash

@@ -1,3 +1,11 @@
 #!/bin/bash
 
-alias em="open -a emacs"
+case $OSTYPE in
+  linux*)
+    alias em='emacs'
+    alias e='emacsclient -n'
+    ;;
+  darwin*)
+    alias em="open -a emacs"
+    ;;
+esac

aliases/available/general.aliases.bash

@@ -39,13 +39,17 @@ alias piano="pianobar"
 
 alias ..='cd ..'         # Go up one directory
 alias ...='cd ../..'     # Go up two directories
+alias ....='cd ../../..' # Go up two directories
 alias -- -="cd -"        # Go back
 
 # Shell History
 alias h='history'
 
 # Tree
-alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
+if [ ! -x "$(which tree)" ]
+then
+  alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
+fi
 
 # Directory
 alias	md='mkdir -p'

aliases/available/textmate.aliases.bash

@@ -1,5 +1,9 @@
 #!/bin/bash
 
-# Textmate
+case $OSTYPE in
-alias e='mate . &'
+  darwin*)
-alias et='mate app config db lib public script test spec config.ru Gemfile Rakefile README &'
+    # Textmate
+    alias e='mate . &'
+    alias et='mate app config db lib public script test spec config.ru Gemfile Rakefile README &'
+    ;;
+esac