summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Babenhauserheide <arne_bab@web.de>2011-05-14 02:18:20 +0200
committerArne Babenhauserheide <arne_bab@web.de>2011-05-14 02:18:20 +0200
commit7ce2c78efeb15b913d85b316d8189cc91176003b (patch)
tree4a961ec9d26b99b253cd7a8afc24e5f9dc0f46aa
parent68c34dd555fe52f38cc0e75483bb8fb688652c0a (diff)
removed now obsolete merge-news script.
-rw-r--r--contributing/web_pages/news/merge-news13
1 files changed, 0 insertions, 13 deletions
diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news
deleted file mode 100644
index 33c01b7b..00000000
--- a/contributing/web_pages/news/merge-news
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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