joshtronic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	zsh/zshrc
This commit is contained in:
Josh Sherman 2013-12-06 15:19:38 -05:00
commit 6c4ed6c65c
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zsh/zshrc
View file

@ -48,6 +48,7 @@ alias gf="git fetch"
alias gl="git log"
alias gm="git merge"
alias gmm="git merge master"
alias gmup="git fetch upstream; git merge origin/upstream"
alias gmv="git mv"
alias gp="git rev-parse --abbrev-ref HEAD | xargs git push origin"
alias gpu="git rev-parse --abbrev-ref HEAD | xargs git pull origin"
@ -63,7 +64,7 @@ alias gs="git status"
alias grep="grep --exclude-dir=.git"
# jekyll
alias jekyll="jekyll --watch serve"
alias jekyll="jekyll serve --watch"
# local tunnel
alias lt="localtunnel -k ~/.ssh/id_rsa.pub 80"