[FIX] reference to a generic 'origin' remote instead of odoo

diff --git a/doc/git.rst b/doc/git.rst
index 4352f08..ecac7d5 100644 (file)
--- a/doc/git.rst
+++ b/doc/git.rst
@@ -81,7 +81,7 @@ Basic development workflow
 
   - update the remotes with ``git fetch --all``
   - merge the remote branch into the local one with ``git merge --no-ff
-    origin/trunk``
+    odoo/trunk``
 
 * to push the branch to the development repository, use ``git push -u dev
   <branchname>``, this will automatically create a branch called