Skip to content
Browse files

is this dangerous though? if stash pairs dont match

  • Loading branch information...
1 parent 312389c commit d782b4860ca4e0f911e5d9eb6ec1144a7c4ed0b5 @lachie committed Mar 28, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 home/.oh-my-zsh/custom/git.zsh
2 home/.oh-my-zsh/custom/git.zsh
@@ -20,6 +20,6 @@ function git_current_branch() {
alias gpthis='git push origin HEAD:$(git_current_branch)'
alias grb='git rebase -p'
-alias gup='git fetch origin && grb origin/$(git_current_branch)'
+alias gup='git stash && git fetch origin && grb origin/$(git_current_branch) && git stash pop'
alias gm='git merge --no-ff'

0 comments on commit d782b48

Please sign in to comment.
Something went wrong with that request. Please try again.