Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pablo Lalloni 2013-07-10 10:43:36 -03:00
commit 6025882f1d
7 changed files with 154 additions and 40 deletions

View file

@ -83,7 +83,7 @@ compdef _git gm=git-mergetool
alias gg='git gui citool'
alias gga='git gui citool --amend'
alias gk='gitk --all --branches'
alias gss='git stash show --text'
alias gsts='git stash show --text'
# Will cd into the top of the current repository
# or submodule.