linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-20 03:02:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update repo command after repo optims

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2014-07-03 16:15:50 +02:00
commit 9d33362345
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
View file

@ -104,7 +104,8 @@ function bb_merge_bottom_branch_to_here()
return 1 return 1
esac esac
echo "Merging branch $bottom_branch to $branch..." echo "Merging branch $bottom_branch to $branch..."
git merge umg/platform/buildbot/$bottom_branch --m "Manual merge of branch 'platform/buildbot/$bottom_branch' into 'platform/buildbot/$branch'" cmd="git merge umg/platform/buildbot/$bottom_branch --m \"Manual merge of branch 'platform/buildbot/$bottom_branch' into 'platform/buildbot/$branch'\""
eval $cmd
git mergetool --no-prompt git mergetool --no-prompt
} }

26
custom/plugins/intel-repo/repo.plugin.zsh Normal file
View file

@ -0,0 +1,26 @@
alias rs='repo sync -a'
compdef _repo rs='repo sync'
alias rs.='repo sync -a .'
compdef _repo rs.='repo sync'
alias rsrra='repo sync -a ; repo rebase --auto-stash'
compdef _repo rsrra='repo rebase'
alias rsrra.='repo sync -a .; repo rebase --auto-stash .'
compdef _repo rsrra.='repo rebase'
function rsbrsrra()
{
if [[ -z $1 ]]; then
echo "usage: rsbrsrra <branch name>"
exit 1
fi
echo "Starting branch $1 and syncing up all project (repo rebase)"
repo start $1 --all || return 1
repo sync -a || return 1
repo rebase --auto-stash || return 1
}
alias rclean="repo forall -c 'git remote prune umg'"
compdef _repo rclean='repo forall'