diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2017-05-15 09:55:59 +0100 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2017-05-15 09:55:59 +0100 |
| commit | 83f3b63568b64b1ad453cd23f15f79a6f5b2b247 (patch) | |
| tree | d61b7d3ef6a20ddce5a232bd30942c9752480988 | |
| parent | 6633c5f33a2ed4d4098a5a7c7061b664167dd255 (diff) | |
merge some branches after pushing them
| -rwxr-xr-x | spice-server/rebase | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spice-server/rebase b/spice-server/rebase index 22257e4..31995ea 100755 --- a/spice-server/rebase +++ b/spice-server/rebase @@ -98,6 +98,10 @@ if [ "$failed_compile" != "" ]; then echo "FAILED TO COMPILE:$failed_compile" fi +Git_merge --safe cork network_improves +Git_merge --safe cork virgl-spice +Git_merge --safe virgl-spice virgl-spice-save + if [ "$failed" != "" ]; then echo "FAILED BRANCHES:$failed" echo "Expected: xxx cpp cleanup" |