summaryrefslogtreecommitdiff
path: root/doc/git.rst
diff options
context:
space:
mode:
Diffstat (limited to 'doc/git.rst')
-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