Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-06-26 17:24:11 +02:00
commit e646ee6caa
16 changed files with 296 additions and 27 deletions

View file

@ -1,9 +1,12 @@
# Aliases
alias r='repo'
compdef _repo r=repo
alias rra='repo rebase --auto-stash'
compdef _repo rra='repo rebase --auto-stash'
alias rs='repo sync'
compdef _repo rs='repo sync'
alias rsrra='repo sync ; repo rebase --auto-stash'
compdef _repo rsrra='repo sync ; repo rebase --auto-stash'