Skip to content

Commit

Permalink
howto/maintain: mark titles for asciidoc
Browse files Browse the repository at this point in the history
  • Loading branch information
Junio C Hamano committed Jan 4, 2013
1 parent cc1b258 commit ab05d7c
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions Documentation/howto/maintain-git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Abstract: Imagine that git development is racing along as usual, when our friend
hordes of suckers (loyal developers), you have been tricked (chosen) to
step up as the new maintainer. This howto will show you "how to" do it.

Activities
----------

The maintainer's git time is spent on three activities.

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

Scratching my own itch and sending proposed patch series out.

The Policy
----------

The policy on Integration is informally mentioned in "A Note
from the maintainer" message, which is periodically posted to
this mailing list after each feature release is made.

The policy.

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


A Typical Git Day
-----------------

A typical git day for the maintainer implements the above policy
by doing the following:

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

Observations
------------

Some observations to be made.

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


[Appendix]
Appendix
--------

Preparing a "merge-fix"
~~~~~~~~~~~~~~~~~~~~~~~

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

0 comments on commit ab05d7c

Please sign in to comment.