diff options
Diffstat (limited to 'contributing/web_pages/news/merge-news')
| -rw-r--r-- | contributing/web_pages/news/merge-news | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news new file mode 100644 index 00000000..33c01b7b --- /dev/null +++ b/contributing/web_pages/news/merge-news @@ -0,0 +1,13 @@ +#!/bin/sh + +# merge into master +git checkout master +git pull --rebase +git merge master-news_next + +# push master +git push origin master + +# switch back to master-news_next +git checkout master-news_next +git pull --rebase |