1 <!--#include virtual="/doctype.inc" -->
4 i-scream Git Repositories
6 <!--#include virtual="/style.inc" -->
11 <!--#include virtual="/header.inc" -->
14 i-scream Git Repositories
17 The i-scream Git repositories contain the currently
18 developed source code. All historic source code can be
19 found in <a href="/cvs.xhtml">CVS</a>.
22 All code available in the Git repositories is
23 <a href= "/license.xhtml">licensed</a> under the GPL
24 unless otherwise stated.
30 Our Git repositories are located on GitHub. You can find
31 then all under this GitHub Organisation.
34 <a href="https://github.com/libstatgrab">https://github.com/libstatgrab</a>
40 We've chosen a set of guidelines to work by so that
41 everybody is clear about how the Git repositories will be
42 used. This should make life easier for developers and
43 users. The aim is to keep things clear and simple without
44 adding unnecessary overheads. We don't have need for
45 anything as complex as git-flow.
49 The <code>master</code> branch will always be buildable
50 and should be usable. Development work does not happen
54 New releases will be taken from the <code>master</code>
55 branch and will be tagged there.
58 The master branch will never have its history rewritten.
61 Development work will be done on branches. These
62 branches may only live for the period of the development
63 work. Once the work is complete and tested it will be
64 merged to master and the branch may be deleted.
67 The history on development branches may be rewritten to
68 tidy things up before merging. This probably won't
69 happen often, but don't get upset if it does.
72 If you want to submit changes it's best to do them
73 against the <code>master</code> branch unless you're
74 specifically working with a developer on an issue
78 Gratuitous merge commits should be avoided, particularly
79 when merging development branches to <code>master</code>.
80 They don't offer much in the way of useful information
81 and make operations like bisect harder. In particular,
82 if you pull changes to your local repository and end up
83 with a merge commit you should use rebase to get rid of
88 <!--#include virtual="/footer.inc" -->
90 <!--#include virtual="/menu.inc" -->