diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2010-01-25 09:32:41 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2010-01-25 09:35:03 +0100 |
| commit | c25b99ab435d8241ab247ef0d86b33b41457f6dd (patch) | |
| tree | 1726ea2b01db7be335400ae0d5860672efcd1aa2 /contributing/web_pages/news.mdwn | |
| parent | eca15103f7627fa8fd51f8b5c88a1a4a59059f39 (diff) | |
| download | web-c25b99ab435d8241ab247ef0d86b33b41457f6dd.tar.gz web-c25b99ab435d8241ab247ef0d86b33b41457f6dd.tar.bz2 web-c25b99ab435d8241ab247ef0d86b33b41457f6dd.zip | |
news: Added a news-skelleton page in contributing/web_pages and a note that the merge can be done more conveniently by using a small shell script.
Diffstat (limited to 'contributing/web_pages/news.mdwn')
| -rw-r--r-- | contributing/web_pages/news.mdwn | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/contributing/web_pages/news.mdwn b/contributing/web_pages/news.mdwn index f5cb4344..d79e710c 100644 --- a/contributing/web_pages/news.mdwn +++ b/contributing/web_pages/news.mdwn @@ -53,13 +53,14 @@ For practical work that means to use the following commands: * at the beginning of a month: create a new news entry - $ cp news/2009-07-31.mdwn news/YYYY-MM-DD.mdwn + $ cp news/2009-12-31.mdwn news/YYYY-MM-DD.mdwn $ # edit the new file, then add the changes in git $ git add news/YYYY-MM-DD.mdwn $ git commit -m "Begun the news entry for YYYY-MM-DD." - That is, use the *2009-07-31* news snippet as a template for the new - one. + That is, use the *2009-12-31* news snippet as a template for the new + one. Alternately you can use the [[news_skelleton|news-skelleton]] + *(contributing/web_pages/news-skelleton.mdwn)*. * check the outgoing changes @@ -107,4 +108,20 @@ For practical work that means to use the following commands: After that merge, work for the next month's news item can continue on `master-news_next`. -And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand.
\ No newline at end of file +And since we're working in a branch anyway: Please commit often, push often and pull often! Few things would be nastier than having to do heavy merging on a news release date with little time at hand. + +PS: If you're lazy, you can just use the following shell-script to merge the news into master: + +> \#!/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 |