aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-08-16 00:15:00 +0200
committerMattias Andrée <maandree@operamail.com>2013-08-16 00:15:00 +0200
commitd419d223e2ae60c8131c96193000bc504a3210bd (patch)
treed23d7cb91a83bff7cc423014e338b5d8a948d4a6 /using-git.texinfo
parentgna! runs on only free software (diff)
downloadusing-git-d419d223e2ae60c8131c96193000bc504a3210bd.tar.gz
using-git-d419d223e2ae60c8131c96193000bc504a3210bd.tar.bz2
using-git-d419d223e2ae60c8131c96193000bc504a3210bd.tar.xz
workflow
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo31
1 files changed, 31 insertions, 0 deletions
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