rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update branch documentation in HACKING

Browse Source
This commit is contained in:
Florian Bruhin 2014-10-20 17:15:35 +02:00
parent a6f1bf29ae
commit c4cd6fc56a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/HACKING.asciidoc
View File

@ -68,21 +68,20 @@ contributing, feel free to send normal patches instead, e.g. generated via
Finding the correct branch Finding the correct branch
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
Currently, qutebrowser is developed in the `master` branch. Feature branches qutebrowser is developed in the `master` branch. Feature branches are used by
are used by me occasionally and pushed as a backup, but frequently me occasionally and pushed as a backup, but frequently force-pushed. Do *not*
force-pushed. Do *not* base your work on any of the feature branches, use base your work on any of the feature branches, use `master` instead.
`master` instead.
After v0.1 is released, an additional `development` branch will be added. Then, For every release, a `vX.Y-stable` branch will be created. Base new features on
base new features on the `development` branch, and bugfixes on the `master` the `master` branch, and bugfixes for existing stuff on the `...-stable`
branch. branch.
You can then checkout the correct branch via: You can checkout the correct branch via:
---- ----
git checkout base-branch <1> git checkout branch <1>
---- ----
<1> Of course replace `base-branch` by `development` or `master`. <1> Of course replace `branch` by `master` or `vX.Y-stable`.
Getting patches Getting patches