Skip to content

Commit ab05d7c

Browse files
committed
howto/maintain: mark titles for asciidoc
1 parent cc1b258 commit ab05d7c

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

Documentation/howto/maintain-git.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Abstract: Imagine that git development is racing along as usual, when our friend
66
hordes of suckers (loyal developers), you have been tricked (chosen) to
77
step up as the new maintainer. This howto will show you "how to" do it.
88

9+
Activities
10+
----------
11+
912
The maintainer's git time is spent on three activities.
1013

1114
- Communication (45%)
@@ -25,12 +28,13 @@ The maintainer's git time is spent on three activities.
2528

2629
Scratching my own itch and sending proposed patch series out.
2730

31+
The Policy
32+
----------
33+
2834
The policy on Integration is informally mentioned in "A Note
2935
from the maintainer" message, which is periodically posted to
3036
this mailing list after each feature release is made.
3137

32-
The policy.
33-
3438
- Feature releases are numbered as vX.Y.Z and are meant to
3539
contain bugfixes and enhancements in any area, including
3640
functionality, performance and usability, without regression.
@@ -79,6 +83,9 @@ The policy.
7983
are found before new topics are merged to 'master'.
8084

8185

86+
A Typical Git Day
87+
-----------------
88+
8289
A typical git day for the maintainer implements the above policy
8390
by doing the following:
8491

@@ -320,6 +327,9 @@ by doing the following:
320327
- Push the integration branches out to public places; Meta/pushall
321328
script may aid this step.
322329

330+
Observations
331+
------------
332+
323333
Some observations to be made.
324334

325335
* Each topic is tested individually, and also together with other
@@ -353,9 +363,11 @@ Some observations to be made.
353363
'master' branch typically is.
354364

355365

356-
[Appendix]
366+
Appendix
367+
--------
357368

358369
Preparing a "merge-fix"
370+
~~~~~~~~~~~~~~~~~~~~~~~
359371

360372
A merge of two topics may not textually conflict but still have
361373
conflict at the semantic level. A classic example is for one topic

0 commit comments

Comments
 (0)