diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 21:11:29 -0700 |
| commit | 3d0a1bb06b895c5be6e3f0517d355442a6b1e125 (patch) | |
| tree | 84069ebc3254825b952a482e11cdbbbc69f6fe85 /rt/docs/hacking.pod | |
| parent | f3b99c11d6eed33f467dda360180a698a85c54e8 (diff) | |
| parent | d62206a94d9d49ef96640e0a8ec492679f8345e9 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/docs/hacking.pod')
| -rw-r--r-- | rt/docs/hacking.pod | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rt/docs/hacking.pod b/rt/docs/hacking.pod index 396c5623d..7c50ee901 100644 --- a/rt/docs/hacking.pod +++ b/rt/docs/hacking.pod @@ -38,7 +38,9 @@ For example, a bugfix branched from C<4.0-trunk> might be named C<4.0/fail-taint-mode-early>. A feature branched from C<master> when there exists a C<4.0-trunk> but no C<4.2-trunk> might be named C<4.2/rename-LogToScreen>. For consistency, branches should use dashes, -not underscores, to separate words. +not underscores, to separate words. Branches which are destined for +4.2, but which are branched from 4.0 (to provide for easy extraction as +a 4.0 extension) should be named 4.2-on-4.0/branch-name. Branches should be reviewed by another developer before being merged. Reviewers should make sure that the branch accomplishes what it claims |