diff options
| -rw-r--r-- | community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 00000000..7a7e4b07 --- /dev/null +++ b/community/weblogs/ArneBab/howto-news-month-of-the-hurd.mdwn @@ -0,0 +1,45 @@ +[[!meta copyright="Copyright © 2009 Free Software Foundation, Inc."]] + +[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable +id="license" text="Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license +is included in the section entitled [[GNU Free Documentation +License|/fdl]]."]]"""]] + +[[!meta title="HowTo prepare and publish 'a month of the Hurd' for the next month"]] + +We prepare the month of the Hurd in a public git branch (master-news_next) and merge it once we want to publish the news. + +For practical work that means, we use the following commands: + +## 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 + + git fetch && git checkout master-news_next + +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 + + git log --reverse -p -C origin/master-news_next..master-news_next + +## push the changes + + git push master-news_next + +## if push fails, pull and rebase + + git pull --rebase + +## publish the news + + git checkout master && git merge master-news_next + +That means, for publishing we merge master-news_next into master. |