phpBB

Development Wiki

Difference between revisions of "Git"

From phpBB Development Wiki

(Versions)
Line 6: Line 6:
 
=== Repository ===
 
=== Repository ===
 
<pre>git://github.com/phpbb/phpbb.git</pre>
 
<pre>git://github.com/phpbb/phpbb.git</pre>
 +
 +
=== Branches ===
 +
 +
* master - Development [http://github.com/phpbb/phpbb/tree/master View on GitHub]
 +
 +
Since phpBB 4 is still far from a stable version, there is only one development branch, in which all development takes place.
  
 
== phpBB3 ==
 
== phpBB3 ==
Line 13: Line 19:
 
=== Branches ===
 
=== Branches ===
  
* master - Release [http://github.com/phpbb/phpbb3/tree/master]
+
* master - Release [http://github.com/phpbb/phpbb3/tree/master View on GitHub]
* develop - Next feature release development [http://github.com/phpbb/phpbb3/tree/develop]
+
* develop - Next feature release development [http://github.com/phpbb/phpbb3/tree/develop View on GitHub]
* develop-olympus - Olympus release maintenance [http://github.com/phpbb/phpbb3/tree/develop-olympus]
+
* develop-olympus - Olympus release maintenance [http://github.com/phpbb/phpbb3/tree/develop-olympus View on GitHub]
 +
 
 +
This means all bugfix development should take place on develop-olympus and will be merged into develop. All feature development should take place in develop.
  
 
== phpBB2 ==
 
== phpBB2 ==
Line 24: Line 32:
 
=== Branches ===
 
=== Branches ===
  
* master-phpbb2 - Release [http://github.com/phpbb/phpbb3/tree/master-phpbb2]
+
* master-phpbb2 - Release [http://github.com/phpbb/phpbb3/tree/master-phpbb2 View on GitHub]
  
 
[[Category:Development]]
 
[[Category:Development]]

Revision as of 14:47, 5 March 2010

This document provides details of the various repositories and branches available as part of the phpBB Git infrastructure, for details of how to use git please see Working with Git.

Versions

phpBB4

Repository

git://github.com/phpbb/phpbb.git

Branches

Since phpBB 4 is still far from a stable version, there is only one development branch, in which all development takes place.

phpBB3

Repository

git://github.com/phpbb/phpbb3.git

Branches

This means all bugfix development should take place on develop-olympus and will be merged into develop. All feature development should take place in develop.

phpBB2

Repository

git://github.com/phpbb/phpbb3.git

Branches