From d419d223e2ae60c8131c96193000bc504a3210bd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 16 Aug 2013 00:15:00 +0200 Subject: workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- using-git.texinfo | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'using-git.texinfo') diff --git a/using-git.texinfo b/using-git.texinfo index ac8243a..c5879af 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -52,6 +52,7 @@ Texts. A copy of the license is included in the section entitled @menu * Getting started:: * Introduction:: +* Branching out:: * GNU Free Documentation License:: @end menu @@ -318,6 +319,36 @@ to the blessed repository. +@node Branching out +@chapter Branching out + +@menu +* Workflow:: +@end menu + + + +@node Workflow +@section Workflow + +Git encourage you to create multiple local +branches of you repository. A branch is a +fork of your commit history, it allows you +to implement features in parallel. The most +important part with this is that you can +fix bugs meanwhile you are working one big +new features. + +You main branch is by default called `master', +from it, it is recommended to have a branch +called `develop'. The develop branch is the +branch you work on, and when it is stable, +you merge it with the master branch. + +For the develop branch you can branch out +an create topic branches, an disposable +experiments. + @node GNU Free Documentation License -- cgit v1.2.3-70-g09d2