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 ``, this will automatically create a branch called