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
esac
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
}