From 52e1796c84e4c87166b80825b1ee6537087be23f Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Wed, 22 Jul 2009 00:33:19 +0200 Subject: News publishing howto renicing. --- .../weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn') 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. -- cgit v1.2.3