diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2010-01-25 10:22:04 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2010-01-25 10:22:04 +0100 |
| commit | 75d3cec57800b933728ce10d58f4d02ad46f3b1f (patch) | |
| tree | b8c53b31a155e2a872f143617922b531b5eaef3d /contributing/web_pages/news/merge-news | |
| parent | c811b25017f7bd4f43d1f068a974812ae62e045b (diff) | |
contributing/web_pages/news: Split out Arne's merge-news script.
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 |