Merge branch 'master' of github.com:joshtronic/dotfiles

This commit is contained in:
Josh Sherman 2013-08-28 13:21:06 -04:00
commit b17f665fba

View file

@ -49,12 +49,8 @@ alias gl="git log"
alias gm="git merge"
alias gmm="git merge master"
alias gmv="git mv"
alias gp="git push"
alias gpoh="git push origin HEAD"
alias gpom="git push origin master"
alias gpu="git pull"
alias gpuoh="git pull origin HEAD"
alias gpuom="git pull origin master"
alias gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
alias gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
alias gr="git remote"
alias gra="git remote add"
alias grao="git remote add origin"
@ -67,7 +63,7 @@ alias gs="git status"
alias grep="grep --exclude-dir=.git"
# jekyll
alias jekyll="jekyll serve --watch"
alias jekyll="jekyll --auto --server"
# local tunnel
alias lt="localtunnel -k ~/.ssh/id_rsa.pub 80"