From ade545209d3a5bc6b77fedb846f41df1ec8744e2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 May 2014 14:25:58 +0200
Subject: [PATCH] [FIX] reference to a generic 'origin' remote instead of odoo

---
 doc/git.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/git.rst b/doc/git.rst
index 4352f08d600..ecac7d5b5aa 100644
--- 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