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

2014-05-15 14:25:58 +02:00 · 2014-05-15 14:25:58 +02:00 · ade545209d
parent 2ea0cfcfb8
commit ade545209d
1 changed files with 1 additions and 1 deletions
--- 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