undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

howto/maintain: mark titles for asciidoc

Browse Source
This commit is contained in:
Junio C Hamano 2013-01-03 22:56:12 -08:00
parent cc1b258e2a
commit ab05d7c736
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/howto/maintain-git.txt
View File

@ -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 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. 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. The maintainer's git time is spent on three activities.
- Communication (45%) - Communication (45%)
@ -25,12 +28,13 @@ The maintainer's git time is spent on three activities.
Scratching my own itch and sending proposed patch series out. Scratching my own itch and sending proposed patch series out.
The Policy
----------
The policy on Integration is informally mentioned in "A Note The policy on Integration is informally mentioned in "A Note
from the maintainer" message, which is periodically posted to from the maintainer" message, which is periodically posted to
this mailing list after each feature release is made. this mailing list after each feature release is made.
The policy.
- Feature releases are numbered as vX.Y.Z and are meant to - Feature releases are numbered as vX.Y.Z and are meant to
contain bugfixes and enhancements in any area, including contain bugfixes and enhancements in any area, including
functionality, performance and usability, without regression. functionality, performance and usability, without regression.
@ -79,6 +83,9 @@ The policy.
are found before new topics are merged to 'master'. are found before new topics are merged to 'master'.
A Typical Git Day
-----------------
A typical git day for the maintainer implements the above policy A typical git day for the maintainer implements the above policy
by doing the following: by doing the following:
@ -320,6 +327,9 @@ by doing the following:
- Push the integration branches out to public places; Meta/pushall - Push the integration branches out to public places; Meta/pushall
script may aid this step. script may aid this step.
Observations
------------
Some observations to be made. Some observations to be made.
* Each topic is tested individually, and also together with other * Each topic is tested individually, and also together with other
@ -353,9 +363,11 @@ Some observations to be made.
'master' branch typically is. 'master' branch typically is.
[Appendix] Appendix
--------
Preparing a "merge-fix" Preparing a "merge-fix"
~~~~~~~~~~~~~~~~~~~~~~~
A merge of two topics may not textually conflict but still have A merge of two topics may not textually conflict but still have
conflict at the semantic level. A classic example is for one topic conflict at the semantic level. A classic example is for one topic