[FIX] redirect /page/website.xyz --> /page/xyz. Currently 302 but fme will convert...

[odoo/odoo.git] / doc / git.rst

diff --git a/doc/git.rst b/doc/git.rst
index 5bf9b47..8f6d87a 100644 (file)
--- a/doc/git.rst
+++ b/doc/git.rst
@@ -1,3 +1,5 @@
+:orphan: true
+
 =============
 Bazaar to git
 =============
@@ -7,7 +9,7 @@ Initializing a working copy
 
 Use the easy-setup shell script::
 
-    curl https://raw.githubusercontent.com/odoo/odoo/master/checkout.sh | sh
+     curl -O https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python2
 
 it will will ask a few questions and create a local copy.
 
@@ -25,7 +27,7 @@ repository can have any number of remotes. The setup script creates 2 remotes:
     the official repository and main branches, roughly corresponds to the old
     "mainline" branches in bazaar. You should never need to push to it, and by
     default your local copy is configured to forbid it.
-``dev``
+``odoo-dev``
     a grab-bag of development branches, you can push your work to it so other
     coworkers can work with you.
 
@@ -69,14 +71,14 @@ Basic development workflow
 * update your remotes with ``git fetch --all``
 * create your development branch with ``git checkout -b <branch_name>
   <source_branch>``. For instance if you wanted to add support for full-text
-  search in trunk you could use ``git checkout -b trunk-fts-xxx odoo/trunk``
+  search in master you could use ``git checkout -b master-fts-xxx odoo/master``
 * do your changes, stage them with ``git add`` and commit them with ``git
   commit``
 * if your branch is long-lived, you may want to update it to its parent
 
   - update the remotes with ``git fetch --all``
   - merge the remote branch into the local one with ``git merge --no-ff
-    odoo/trunk``
+    odoo/master``
 
 * to push the branch to the development repository, use ``git push -u dev
   <branchname>``, this will automatically create a branch called