summaryrefslogtreecommitdiff
path: root/community/weblogs
diff options
context:
space:
mode:
authorArne Babenhauserheide <arne_bab@web.de>2009-07-22 00:33:19 +0200
committerArne Babenhauserheide <arne_bab@web.de>2009-07-22 00:33:19 +0200
commit52e1796c84e4c87166b80825b1ee6537087be23f (patch)
treeb0bdf9c3fb89863397ff268e7c4a24c6835b92f5 /community/weblogs
parent0473546581288401163d28df12d2d51c82bb62df (diff)
News publishing howto renicing.
Diffstat (limited to 'community/weblogs')
-rw-r--r--community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn14
1 files changed, 7 insertions, 7 deletions
diff --git a/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn b/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn
index 7a7e4b07..7aa70337 100644
--- a/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn
+++ b/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn
@@ -14,11 +14,11 @@ We prepare the month of the Hurd in a public git branch (master-news_next) and m
For practical work that means, we use the following commands:
-## create a local branch for news_next
+* create a local branch for news_next
git fetch && git checkout -b master-news_next origin/master-news_next
-## get the latest version of news_next when you already created a local version
+* get the latest version of news_next when you already created a local version
git fetch && git checkout master-news_next
@@ -26,20 +26,20 @@ Always do check which branch you're on (asterisk in the first column of
``git branch'''s output), and only then begin to do your changes and
commit them.
-## check the outgoing changes
+* check the outgoing changes
git log --reverse -p -C origin/master-news_next..master-news_next
-## push the changes
+* push the changes
git push master-news_next
-## if push fails, pull and rebase
+* if push fails, pull and rebase
git pull --rebase
-## publish the news
+* publish the news
- git checkout master && git merge master-news_next
+ git checkout master && git merge master-news_next
That means, for publishing we merge master-news_next into master.