X-Git-Url: http://git.i-scream.org/?a=blobdiff_plain;f=www%2Fgit.xhtml;h=448db0fce879b3eec4c0ea794f44061984ee0701;hb=3cd5172f748345033f24f402cf4899394faa70cb;hp=f509257f02254ecf7f2dccdbe950cd2e2b509792;hpb=067b15fa441dd518e49511ae3080d5814b6e8357;p=www.i-scream.org.git diff --git a/www/git.xhtml b/www/git.xhtml index f509257..448db0f 100644 --- a/www/git.xhtml +++ b/www/git.xhtml @@ -75,48 +75,57 @@ git clone ssh://git@git.i-scream.org/libstatgrab
-- We've chosen a set of guidelines to work by so that - everybody is clear about how the Git repositories will be - used. This should make life easier for developers and - users. The aim is to keep things clear and simple without - adding unnecessary overheads. We don't have need for - anything as complex as git-flow. -
-master
branch will always be buildable
- and should be usable. Development work does not happen
- here directly.
- master
- branch and will be tagged there.
- master
branch unless you're
- specifically working with a developer on an issue
- already.
- + We've chosen a set of guidelines to work by so that + everybody is clear about how the Git repositories will be + used. This should make life easier for developers and + users. The aim is to keep things clear and simple without + adding unnecessary overheads. We don't have need for + anything as complex as git-flow. +
+master
branch will always be buildable
+ and should be usable. Development work does not happen
+ here directly.
+ master
+ branch and will be tagged there.
+ master
branch unless you're
+ specifically working with a developer on an issue
+ already.
+ master
.
+ They don't offer much in the way of useful information
+ and make operations like bisect harder. In particular,
+ if you pull changes to your local repository and end up
+ with a merge commit you should use rebase to get rid of
+ it before pushing.
+