howto/maintain: mark titles for asciidoc
Junio C Hamano committed
Jan 3, 2013 at 22:56 UTC
ab05d7c7361afa123e63767da7c1f85e66d0028f
1 file changed
+15
-3
Documentation/howto/maintain-git.txt
+15
-3
@@ -6,6 +6,9 @@ Abstract: Imagine that git development is racing along as usual, when our friend
6
hordes of suckers (loyal developers), you have been tricked (chosen) to
7
step up as the new maintainer. This howto will show you "how to" do it.
8
9
+Activities
10
+----------
11
+
12
The maintainer's git time is spent on three activities.
13
14
- Communication (45%)
@@ -25,12 +28,13 @@ The maintainer's git time is spent on three activities.
28
29
Scratching my own itch and sending proposed patch series out.
30
31
+The Policy
32
+----------
33
+
34
The policy on Integration is informally mentioned in "A Note
35
from the maintainer" message, which is periodically posted to
36
this mailing list after each feature release is made.
37
32
-The policy.
33
-
38
- Feature releases are numbered as vX.Y.Z and are meant to
39
contain bugfixes and enhancements in any area, including
40
functionality, performance and usability, without regression.
@@ -79,6 +83,9 @@ The policy.
83
are found before new topics are merged to 'master'.
84
85
86
+A Typical Git Day
87
+-----------------
88
+
89
A typical git day for the maintainer implements the above policy
90
by doing the following:
91
@@ -320,6 +327,9 @@ by doing the following:
327
- Push the integration branches out to public places; Meta/pushall
328
script may aid this step.
329
330
+Observations
331
+------------
332
+
333
Some observations to be made.
334
335
* Each topic is tested individually, and also together with other
@@ -353,9 +363,11 @@ Some observations to be made.
363
'master' branch typically is.
364
365
356
-[Appendix]
366
+Appendix
367
+--------
368
369
Preparing a "merge-fix"
370
+~~~~~~~~~~~~~~~~~~~~~~~
371
372
A merge of two topics may not textually conflict but still have
373
conflict at the semantic level. A classic example is for one topic