summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorxmo-odoo <xmo-odoo@users.noreply.github.com>2014-05-16 08:45:22 +0200
committerxmo-odoo <xmo-odoo@users.noreply.github.com>2014-05-16 08:45:22 +0200
commit601cd0cf511e4048a9ddb1b4227d073966b2da75 (patch)
treefcc4c826cc80aee8608c114ebd21bf9ce3bbe5b5 /doc
parent7a2bb307dc90d780fcef72365944110e336e395f (diff)
Link employees guide to migration readme section
Diffstat (limited to 'doc')
-rw-r--r--doc/git.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/git.rst b/doc/git.rst
index cf419160b04..53a09a7b8a7 100644
--- a/doc/git.rst
+++ b/doc/git.rst
@@ -102,6 +102,11 @@ Basic development workflow
Tasks
-----
+Converting your feature branches from bazaar
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`The readme`_ has some instructions.
+
Viewing history: ``git log``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -231,3 +236,5 @@ checked-out branch/commit
.. [#log-patch-empty] but only the changes performed by this actual commit,
for a merge the merged changes are not considered part
of the merge commit
+
+.. _the readme: https://github.com/odoo/odoo/blob/master/README.md#migration-from-bazaar