blob: 17e6b6cbad47b74360e4434aa8763b2259f4d489 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
[[!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 of the branch
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.
* create a new news entry
cp news/yyyy-mm-dd.mdwn news/YYYY-MM-DD.mdwn
(edit the new file)
git add news/YYYY-MM-DD.mdwn
git commit -m "Begun the news entry for YYYY-MM-DD."
(just copy the most recent news file)
* 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.
|
