diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-15 14:25:58 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-15 14:25:58 +0200 |
| commit | ade545209d3a5bc6b77fedb846f41df1ec8744e2 (patch) | |
| tree | 3a9247547e817b468d37fc2efe6baed8e669a948 /doc/git.rst | |
| parent | 2ea0cfcfb888c9966b3a1a915eff5b42b5ed7f8e (diff) | |
[FIX] reference to a generic 'origin' remote instead of odoo
Diffstat (limited to 'doc/git.rst')
| -rw-r--r-- | doc/git.rst | 2 |
1 files changed, 1 insertions, 1 deletions
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 |