more changes

config/bash/aliases.bash

@@ -10,6 +10,7 @@ alias pjson='python -mjson.tool'
 alias vb='VBoxManage'
 alias cpkey='cat ~/.ssh/id_rsa.pub | pbcopy'
 alias til='grep -d recurse -h `date "+%m/%d"` /usr/share/calendar/'
+alias jbgo='cd ~/projects/opensource/jbgo'
 
 # git
 alias g='git'
@@ -36,6 +37,11 @@ alias cuke='bx cucumber'
 alias h=heroku
 alias hr='heroku run'
 
+# ansible
+alias an=ansible
+alias anp=ansible-playbook
+alias ang=ansible-galaxy
+
 function markdown() {
   if [ `which redcarpet` ];
   then
@@ -46,3 +52,10 @@ function markdown() {
     return 1
   fi
 }
+
+function git_branch_wipeout() {
+  remote=$2
+  if [[ ! $remote ]]; then remote=origin; fi
+  git branch -d $1 && git push $remote :refs/heads/$1
+}
+alias gbw=git_branch_wipeout

config/bash/completion.bash

@@ -24,6 +24,7 @@ _complete_grb() {
 alias grbt='grb track'
 complete -F _complete_grb grbt
 complete -F _complete_grb grb
+complete -F _complete_grb gbw
 
 _complete_ssh_hosts() {
   if [ -f ~/.ssh/config ]; then

config/bashrc

@@ -58,6 +58,7 @@ function nametab() {
 # .gitignore contains an entry for dotfiles/local/
 [[ -s ~/dotfiles/local/bashrc ]] && source ~/dotfiles/local/bashrc
 
+export rvmsudo_secure_path=1
 [[ -s ~/.rvm/scripts/rvm ]] && source ~/.rvm/scripts/rvm  # This loads RVM into a shell session.
 [[ -s /usr/local/sbin ]] && export PATH=$PATH:/usr/local/sbin
 [[ -s $HOME/bin ]] && export PATH=$HOME/bin:$PATH

config/gitconfig

@@ -16,6 +16,7 @@
   cpx = cherry-pick -x
   d = diff --color
   dc = diff --color --cached
+  fo = fetch origin
   g = gc
   l = log --color
   ld = log -p --color
@@ -28,8 +29,8 @@
   ra = rebase --abort
   rb = rebase master
   rc = rebase --continue
-  rs = reset HEAD .
-  rsh = reset --hard HEAD
+  rs = reset HEAD --
+  rshh = reset --hard HEAD
   s = status
   pull = pull --ff-only
   undo = reset --soft HEAD^
@@ -44,3 +45,6 @@
 
 [push]
   default = current
+[filter "media"]
+	clean = git-media-clean %f
+	smudge = git-media-smudge %f

config/gitignore

@@ -3,3 +3,4 @@ log/
 tmp/
 .bundle
 .sass-cache/
+tags