From 75d3cec57800b933728ce10d58f4d02ad46f3b1f Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Mon, 25 Jan 2010 10:22:04 +0100
Subject: contributing/web_pages/news: Split out Arne's merge-news script.

---
 contributing/web_pages/news/merge-news | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 contributing/web_pages/news/merge-news

(limited to 'contributing/web_pages/news/merge-news')

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
-- 
cgit v1.2.3