Aliases updated, movein script patched to not use X11 forwarding, and

update gitconfig.

Author: Brad Lhotsky

ackrc

@@ -1,2 +1,3 @@
 --type-set=puppet=.pp
 --type-set=erb=.erb
+--type-add=mason=.comp

bash.d/15-aliases.sh

@@ -15,6 +15,13 @@ alias c="contents"
 # Get Aliases
 alias gg='git grep'
 
+# Hive
+command -v rlwrap &> /dev/null
+rc=$?
+if [[ "$rc" -eq "0" ]]; then
+        alias rlhive='rlwrap -i --prompt-colour=yellow -f ~/.hive_completion -a hive $*'
+fi;
+
 # Some commands can be customized with ENV Variables
 export LESS="-RM"
 

gitconfig

@@ -18,3 +18,7 @@
     hist = log --graph --color=always --pretty='[%C(cyan)%h%Creset]%C(bold cyan)%d%Creset %s' --all
 [branch]
     autosetuprebase = always
+[push]
+	default = upstream
+[pull]
+    rebase = true

support/movein.sh

@@ -13,7 +13,7 @@ fi;
 
 HOST=$1
 
-SSH="/usr/bin/ssh"
+SSH="/usr/bin/ssh -x"
 SCP="/usr/bin/scp"
 RSYNC="/usr/bin/rsync"